build fix: don't use compatibility names in wx code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -440,11 +440,11 @@ void wxPlatform::ClearPlatforms()
|
|||||||
bool wxPlatform::Is(int platform)
|
bool wxPlatform::Is(int platform)
|
||||||
{
|
{
|
||||||
#ifdef __WXMSW__
|
#ifdef __WXMSW__
|
||||||
if (platform == wxMSW)
|
if (platform == wxOS_WINDOWS)
|
||||||
return true;
|
return true;
|
||||||
#endif
|
#endif
|
||||||
#ifdef __WXWINCE__
|
#ifdef __WXWINCE__
|
||||||
if (platform == wxWinCE)
|
if (platform == wxOS_WINDOWS_CE)
|
||||||
return true;
|
return true;
|
||||||
#endif
|
#endif
|
||||||
#if defined(__WXWINCE__) && defined(__POCKETPC__)
|
#if defined(__WXWINCE__) && defined(__POCKETPC__)
|
||||||
@@ -456,31 +456,31 @@ bool wxPlatform::Is(int platform)
|
|||||||
return true;
|
return true;
|
||||||
#endif
|
#endif
|
||||||
#ifdef __WXGTK__
|
#ifdef __WXGTK__
|
||||||
if (platform == wxGTK)
|
if (platform == wxPORT_GTK)
|
||||||
return true;
|
return true;
|
||||||
#endif
|
#endif
|
||||||
#ifdef __WXMAC__
|
#ifdef __WXMAC__
|
||||||
if (platform == wxMac)
|
if (platform == wxPORT_MAC)
|
||||||
return true;
|
return true;
|
||||||
#endif
|
#endif
|
||||||
#ifdef __WXX11__
|
#ifdef __WXX11__
|
||||||
if (platform == wxX11)
|
if (platform == wxPORT_X11)
|
||||||
return true;
|
return true;
|
||||||
#endif
|
#endif
|
||||||
#ifdef __UNIX__
|
#ifdef __UNIX__
|
||||||
if (platform == wxUnix)
|
if (platform == wxOS_UNIX)
|
||||||
return true;
|
return true;
|
||||||
#endif
|
#endif
|
||||||
#ifdef __WXMGL__
|
#ifdef __WXMGL__
|
||||||
if (platform == wxMGL)
|
if (platform == wxPORT_MGL)
|
||||||
return true;
|
return true;
|
||||||
#endif
|
#endif
|
||||||
#ifdef __WXOS2__
|
#ifdef __WXOS2__
|
||||||
if (platform == wxOS2)
|
if (platform == wxPORT_OS2)
|
||||||
return true;
|
return true;
|
||||||
#endif
|
#endif
|
||||||
#ifdef __WXCOCOA__
|
#ifdef __WXCOCOA__
|
||||||
if (platform == wxCocoa)
|
if (platform == wxPORT_MAC)
|
||||||
return true;
|
return true;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user