Reverted part of patch #876969 ("Fixes to Borland warnings"), resulted in bugs when...

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

diff --git a/include/wx/pen.h b/include/wx/pen.h
index d132d8a7c973c70a51f2ccae351a6eca795f3ec6..f1202f58fbc888e75dde234a5614d29434615dc1 100644 (file)
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -3,16 +3,18 @@
 
 #if defined(__WXMSW__)
 #include "wx/msw/pen.h"
 
 #if defined(__WXMSW__)
 #include "wx/msw/pen.h"

-#elif defined(__WXMOTIF__)
-#include "wx/motif/pen.h"
+#elif defined(__WXMOTIF__) || defined(__WXX11__)
+#include "wx/x11/pen.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/pen.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/pen.h"

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

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

-#elif defined(__WXSTUBS__)
-#include "wx/stubs/pen.h"
+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/pen.h"
+#elif defined(__WXPM__)
+#include "wx/os2/pen.h"

 #endif
 
 #endif
 #endif
 
 #endif