Merge commit '37bef590b1d2161b16b2bd33349fc8b56af60920' into master-merge

[xonotic/netradiant.git] / contrib / gtkgensurf / gensurf.h

diff --git a/contrib/gtkgensurf/gensurf.h b/contrib/gtkgensurf/gensurf.h
index cb4a2d55bbda84b8d4931ca91651e84759a347e7..8ed2dd5305f32b5231429d6112281dd525901523 100644 (file)
--- a/contrib/gtkgensurf/gensurf.h
+++ b/contrib/gtkgensurf/gensurf.h
@@ -20,6 +20,7 @@
 #ifndef _GENSURF_H_
 #define _GENSURF_H_
 
+#include "globaldefs.h"
 #include <string.h>
 #include "qertypes.h"
 #include <stdio.h>
@@ -56,7 +57,7 @@ extern _QERBrushTable __BRUSHTABLENAME;
 #define PLUGIN
 #define Q3RADIANT
 
-//#if defined(__linux__) || defined(__APPLE__)
+//#if !GDEF_OS_WINDOWS
 #if 1
 #include <algorithm>
 #else
@@ -411,7 +412,7 @@ extern int SP;       // ^Fishman - Snap to grid.
    extern HCURSOR   ghCursorDefault;
    extern HCURSOR   ghCursorVertex;
    extern HINSTANCE ghInst;*/
-extern GtkWidget *g_pRadiantWnd;
+extern ui::Window g_pRadiantWnd;
 extern ui::Window g_pWnd;
 /*extern HWND      ghwndAngles;
    extern HWND      ghwndFix;