Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced __WXOS2__ by __OS2__ or __WXPM__ as apropriate.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2005-10-23 20:30:53 +00:00
parent de5f07794d
commit 554fdf48f5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/datacmn.cpp
View File

@@ -148,7 +148,7 @@ WXDLLEXPORT_DATA(const wxChar *) wxFileSelectorPromptStr = wxT("Select a file");
// Other default strings // Other default strings
WXDLLEXPORT_DATA(const wxChar *) wxFileSelectorDefaultWildcardStr = WXDLLEXPORT_DATA(const wxChar *) wxFileSelectorDefaultWildcardStr =
#if defined(__WXMSW__) || defined(__WXOS2__) #if defined(__WXMSW__) || defined(__OS2__)
wxT("*.*") wxT("*.*")
#else // Unix/Mac #else // Unix/Mac
wxT("*") wxT("*")
@@ -157,7 +157,7 @@ WXDLLEXPORT_DATA(const wxChar *) wxFileSelectorDefaultWildcardStr =
WXDLLEXPORT_DATA(const wxChar *) wxDirDialogNameStr = wxT("wxDirCtrl"); WXDLLEXPORT_DATA(const wxChar *) wxDirDialogNameStr = wxT("wxDirCtrl");
WXDLLEXPORT_DATA(const wxChar *) wxDirDialogDefaultFolderStr = wxT("/"); WXDLLEXPORT_DATA(const wxChar *) wxDirDialogDefaultFolderStr = wxT("/");
#if defined(__WXMSW__) || defined(__WXOS2__) #if defined(__WXMSW__) || defined(__OS2__)
WXDLLEXPORT_DATA(const wxChar *) wxUserResourceStr = wxT("TEXT"); WXDLLEXPORT_DATA(const wxChar *) wxUserResourceStr = wxT("TEXT");
#endif #endif

2
src/common/encconv.cpp
View File

@@ -469,7 +469,7 @@ wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding e
platform = wxPLATFORM_WINDOWS; platform = wxPLATFORM_WINDOWS;
#elif defined(__WXGTK__) || defined(__WXMOTIF__) #elif defined(__WXGTK__) || defined(__WXMOTIF__)
platform = wxPLATFORM_UNIX; platform = wxPLATFORM_UNIX;
#elif defined(__WXOS2__) #elif defined(__WXPM__)
platform = wxPLATFORM_OS2; platform = wxPLATFORM_OS2;
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
platform = wxPLATFORM_MAC; platform = wxPLATFORM_MAC;