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

attempt to fix platform property problem on MacOSX

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-03-30 15:56:31 +00:00
parent 31907d0307
commit d003330ce4
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
contrib/src/xrc/xmlres.cpp
View File

@@ -283,19 +283,21 @@ static void ProcessPlatformProperty(wxXmlNode *node)
while (tkn.HasMoreTokens()) while (tkn.HasMoreTokens())
{ {
s = tkn.GetNextToken(); s = tkn.GetNextToken();
if (
#ifdef __WXMSW__ #ifdef __WXMSW__
s == wxString(wxT("win")) if (s == wxT("win")) isok = true;
#elif defined(__UNIX__)
s == wxString(wxT("unix"))
#elif defined(__MAC__)
s == wxString(wxT("mac"))
#elif defined(__OS2__)
s == wxString(wxT("os2"))
#else
FALSE
#endif #endif
) isok = TRUE; #ifdef __UNIX__
if (s == wxT("unix")) isok = true;
#endif
#ifdef __MAC__
if (s == wxT("mac")) isok = true;
#endif
#ifdef __OS2__
if (s == wxT("os2")) isok = true;
#endif
if (isok)
break;
} }
} }

24
src/xrc/xmlres.cpp
View File

@@ -283,19 +283,21 @@ static void ProcessPlatformProperty(wxXmlNode *node)
while (tkn.HasMoreTokens()) while (tkn.HasMoreTokens())
{ {
s = tkn.GetNextToken(); s = tkn.GetNextToken();
if (
#ifdef __WXMSW__ #ifdef __WXMSW__
s == wxString(wxT("win")) if (s == wxT("win")) isok = true;
#elif defined(__UNIX__)
s == wxString(wxT("unix"))
#elif defined(__MAC__)
s == wxString(wxT("mac"))
#elif defined(__OS2__)
s == wxString(wxT("os2"))
#else
FALSE
#endif #endif
) isok = TRUE; #ifdef __UNIX__
if (s == wxT("unix")) isok = true;
#endif
#ifdef __MAC__
if (s == wxT("mac")) isok = true;
#endif
#ifdef __OS2__
if (s == wxT("os2")) isok = true;
#endif
if (isok)
break;
} }
} }