undef CreateWindow too, even if we don't use it ourselves it's still a very common...

[wxWidgets.git] / include / wx / gdiobj.h

diff --git a/include/wx/gdiobj.h b/include/wx/gdiobj.h
index 4ab7c5ad812c0c36ef8c4c2e1050e615504261e2..ad84296999e4f6c57199ccb755e331e1e719e60d 100644 (file)
--- a/include/wx/gdiobj.h
+++ b/include/wx/gdiobj.h
@@ -1,20 +1,24 @@
 #ifndef _WX_GDIOBJ_H_BASE_
 #define _WX_GDIOBJ_H_BASE_
 
 #ifndef _WX_GDIOBJ_H_BASE_
 #define _WX_GDIOBJ_H_BASE_
 

-#if defined(__WXMSW__)
+#if defined(__PALMOS__)
+#include "wx/palmos/gdiobj.h"
+#elif defined(__WXMSW__)

 #include "wx/msw/gdiobj.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/gdiobj.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/gdiobj.h"
 #include "wx/msw/gdiobj.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/gdiobj.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/gdiobj.h"

-#elif defined(__WXQT__)
-#include "wx/qt/gdiobj.h"
+#elif defined(__WXX11__)
+#include "wx/x11/gdiobj.h"
+#elif defined(__WXMGL__)
+#include "wx/mgl/gdiobj.h"

 #elif defined(__WXMAC__)
 #include "wx/mac/gdiobj.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/gdiobj.h"

+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/gdiobj.h"

 #elif defined(__WXPM__)
 #include "wx/os2/gdiobj.h"
 #elif defined(__WXPM__)
 #include "wx/os2/gdiobj.h"

-#elif defined(__WXSTUBS__)
-#include "wx/stubs/gdiobj.h"

 #endif
 
 #endif
 #endif
 
 #endif