From fbf618dff87a9e4a88d5be458cecc50309b30af3 Mon Sep 17 00:00:00 2001
From: Stefan Neis <Stefan.Neis@t-online.de>
Date: Sun, 23 Oct 2005 20:42:59 +0000
Subject: [PATCH] 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
---
 include/wx/os2/private.h | 4 ++--
 include/wx/platform.h    | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index 02a11b3ac5..d0773e6e6a 100644
--- 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 7dd47e6e0f..f91591ed01 100644
--- 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
-- 
2.45.2