Replaced __WXOS2__ by __OS2__ or __WXPM__ as apropriate.

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

diff --git a/src/common/datacmn.cpp b/src/common/datacmn.cpp
index a60fa186316d2d8219561b0ba78efbc442a78c7d..4e45eb03432365bb02b78fd904290b22280aeeb9 100644 (file)
--- a/src/common/datacmn.cpp
+++ b/src/common/datacmn.cpp
@@ -148,7 +148,7 @@ WXDLLEXPORT_DATA(const wxChar *) wxFileSelectorPromptStr = wxT("Select a file");
 
 // Other default strings
 WXDLLEXPORT_DATA(const wxChar *) wxFileSelectorDefaultWildcardStr =
-#if defined(__WXMSW__) || defined(__WXOS2__)
+#if defined(__WXMSW__) || defined(__OS2__)
     wxT("*.*")
 #else // Unix/Mac
     wxT("*")
@@ -157,7 +157,7 @@ WXDLLEXPORT_DATA(const wxChar *) wxFileSelectorDefaultWildcardStr =
 WXDLLEXPORT_DATA(const wxChar *) wxDirDialogNameStr = wxT("wxDirCtrl");
 WXDLLEXPORT_DATA(const wxChar *) wxDirDialogDefaultFolderStr = wxT("/");
 
-#if defined(__WXMSW__) || defined(__WXOS2__)
+#if defined(__WXMSW__) || defined(__OS2__)
 WXDLLEXPORT_DATA(const wxChar *) wxUserResourceStr = wxT("TEXT");
 #endif
 

diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp
index 267b96b8e9aa17fd3afc9fe37e3b213ae5fac29e..a44449dc0d744a516082f79f767c0b3bbbcc888e 100644 (file)
--- a/src/common/encconv.cpp
+++ b/src/common/encconv.cpp
@@ -469,7 +469,7 @@ wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding e
         platform = wxPLATFORM_WINDOWS;
 #elif defined(__WXGTK__) || defined(__WXMOTIF__)
         platform = wxPLATFORM_UNIX;
-#elif defined(__WXOS2__)
+#elif defined(__WXPM__)
         platform = wxPLATFORM_OS2;
 #elif defined(__WXMAC__)
         platform = wxPLATFORM_MAC;