Removed unused symbol __WXOS2__ (it's either __OS2__ when platform specific

       - similar to __UNIX__ - or __WXPM__ when specific to the port - similar
       to symbols __WXMOTIF__ or __WXGTK__).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index 02a11b3ac5014569292ec7326d92e4de0444adaa..d0773e6e6aab9789ce45ecc9bf6a8f8e6838d0eb 100644 (file)
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -286,7 +286,7 @@ extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w = 0, int h = 0);
 // global data
 // ---------------------------------------------------------------------------
 
-#ifdef __WXOS2__
+#ifdef __WXPM__
 // The MakeProcInstance version of the function wxSubclassedGenericControlProc
 WXDLLEXPORT_DATA(extern int) wxGenericControlSubClassProc;
 WXDLLEXPORT_DATA(extern wxChar*) wxBuffer;
@@ -297,7 +297,7 @@ WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance;
 // global functions
 // ---------------------------------------------------------------------------
 
-#ifdef __WXOS2__
+#ifdef __WXPM__
 extern "C"
 {
 WXDLLEXPORT HINSTANCE wxGetInstance();

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 7dd47e6e0f34405fcf0453fc7e37ad5ef1cdbfc1..f91591ed0137900e61e7e7ecb96a704f747b1d68 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