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

Fixed OS/2 specific defines (there's no such thing as WXOS2).

Browse Source 
Added the more commonly used wxPORT_PM as alias for wxPORT_OS2.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2006-08-27 16:40:17 +00:00
parent d1c3843c77
commit 8ab09e65f9
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/platinfo.h
View File

@@ -74,7 +74,8 @@ enum wxPortId
wxPORT_GTK = 1 << 3, // wxGTK, using GTK+ 1.x, 2.x, GPE or Maemo wxPORT_GTK = 1 << 3, // wxGTK, using GTK+ 1.x, 2.x, GPE or Maemo
wxPORT_MGL = 1 << 4, // wxMGL, using wxUniversal wxPORT_MGL = 1 << 4, // wxMGL, using wxUniversal
wxPORT_X11 = 1 << 5, // wxX11, using wxUniversal wxPORT_X11 = 1 << 5, // wxX11, using wxUniversal
wxPORT_OS2 = 1 << 6, // wxOS2, using OS/2 Presentation Manager wxPORT_PM = 1 << 6, // wxOS2, using OS/2 Presentation Manager
wxPORT_OS2 = wxPORT_PM, // wxOS2, using OS/2 Presentation Manager
wxPORT_MAC = 1 << 7, // wxMac, using Carbon or Classic Mac API wxPORT_MAC = 1 << 7, // wxMac, using Carbon or Classic Mac API
wxPORT_COCOA = 1 << 8, // wxCocoa, using Cocoa NextStep/Mac API wxPORT_COCOA = 1 << 8, // wxCocoa, using Cocoa NextStep/Mac API
wxPORT_WINCE = 1 << 9, // wxWinCE, toolkit is WinCE SDK API wxPORT_WINCE = 1 << 9, // wxWinCE, toolkit is WinCE SDK API

8
src/common/utilscmn.cpp
View File

@@ -483,8 +483,12 @@ bool wxPlatform::Is(int platform)
if (platform == wxPORT_MGL) if (platform == wxPORT_MGL)
return true; return true;
#endif #endif
#ifdef __WXOS2__ #ifdef __OS2__
if (platform == wxPORT_OS2) if (platform == wxOS_OS2)
return true;
#endif
#ifdef __WXPM__
if (platform == wxPORT_PM)
return true; return true;
#endif #endif
#ifdef __WXCOCOA__ #ifdef __WXCOCOA__