wxGetWorkingDirectory() deprecated. Fixed #1338966.

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 545e5f7a56aef1e504db59d003a56e01f53768da..50b2c69ce2b097d561c79a4fbad175b16cee9dcf 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -400,10 +400,7 @@
 #elif defined(__OS2__)
 
     /* wxOS2 vs. non wxOS2 ports on OS2 platform */
-#    ifndef __WXMOTIF__
-#        ifndef __WXOS2__
-#            define __WXOS2__
-#        endif
+#    if !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)
 #        ifndef __WXPM__
 #            define __WXPM__
 #        endif
@@ -493,9 +490,11 @@
 #   define __STDC_EXT__ 1
 #endif
 
-/* Force linking against required libraries under Windows CE: */
+/* Force linking against required libraries under Windows: */
 #ifdef __WXWINCE__
 #   include "wx/msw/wince/libraries.h"
+#elif defined __WINDOWS__
+#   include "wx/msw/libraries.h"
 #endif
 
 /*
@@ -520,7 +519,7 @@
     ( defined( __CYGWIN__ ) && defined( __WINDOWS__ ) ) || \
       (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
     !defined(__DOS__) && \
-    !defined(__WXOS2__) && \
+    !defined(__WXPM__) && \
     !defined(__WXMOTIF__) && \
     !defined(__WXGTK__) && \
     !defined(__WXX11__) && \