From 4363187d4e86c63d9465cbe7296d11fdc7815e32 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Fri, 17 Feb 2017 15:00:52 +0100
Subject: Replace obsolete WIN32 ifdefs with platform define.

---
 plugingui/window.cc | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

(limited to 'plugingui/window.cc')

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);
 }
-- 
cgit v1.2.3