summaryrefslogtreecommitdiff
path: root/plugingui/window.cc
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2017-02-17 15:00:52 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2017-02-17 15:30:16 +0100
commit4363187d4e86c63d9465cbe7296d11fdc7815e32 (patch)
tree33005bd8183d74825b44bc4d47680faf7df009f0 /plugingui/window.cc
parent70e08d1325b2cdd0e9c16a193cc6ed10d2d21617 (diff)
Replace obsolete WIN32 ifdefs with platform define.
Diffstat (limited to 'plugingui/window.cc')
-rw-r--r--plugingui/window.cc35
1 files changed, 18 insertions, 17 deletions
diff --git a/plugingui/window.cc b/plugingui/window.cc
index e2a5b58..d4046c2 100644
--- a/plugingui/window.cc
+++ b/plugingui/window.cc
@@ -30,19 +30,19 @@
#include "painter.h"
-#ifndef PUGL
-#ifdef X11
+#ifndef UI_PUGL
+#ifdef UI_X11
#include "nativewindow_x11.h"
-#endif/*X11*/
-#ifdef WIN32
+#endif // UI_X11
+#ifdef UI_WIN32
#include "nativewindow_win32.h"
-#endif/*WIN32*/
-#ifdef COCOA
+#endif // UI_WIN32
+#ifdef UI_COCOA
#include "nativewindow_cocoa.h"
-#endif/*COCOA*/
+#endif // UI_COCOA
#else
#include "nativewindow_pugl.h"
-#endif
+#endif // !UI_PUGL
namespace GUI
{
@@ -55,19 +55,20 @@ Window::Window(void* native_window)
_width = wpixbuf.width;
_height = wpixbuf.height;
-#ifndef PUGL
-#ifdef X11
+#ifndef UI_PUGL
+#ifdef UI_X11
native = new NativeWindowX11(native_window, *this);
-#endif/*X11*/
-#ifdef WIN32
+#endif // UI_X11
+#ifdef UI_WIN32
native = new NativeWindowWin32(native_window, *this);
-#endif/*WIN32*/
-#ifdef COCOA
+#endif // UI_WIN32
+#ifdef UI_COCOA
native = new NativeWindowCocoa(native_window, *this);
-#endif/*COCOA*/
-#else/*Use pugl*/
+#endif // UI_COCOA
+#else
+ // Use pugl
native = new NativeWindowPugl(native_window, *this);
-#endif
+#endif // !UI_PUGL
eventhandler = new EventHandler(*native, *this);
}