From d003330ce47a4bb81f006aef346a1c1ab5c34ad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 30 Mar 2003 15:56:31 +0000 Subject: [PATCH] attempt to fix platform property problem on MacOSX git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/xrc/xmlres.cpp | 24 +++++++++++++----------- src/xrc/xmlres.cpp | 24 +++++++++++++----------- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/contrib/src/xrc/xmlres.cpp b/contrib/src/xrc/xmlres.cpp index 52d9881e13..e5dc727914 100644 --- a/contrib/src/xrc/xmlres.cpp +++ b/contrib/src/xrc/xmlres.cpp @@ -283,19 +283,21 @@ static void ProcessPlatformProperty(wxXmlNode *node) while (tkn.HasMoreTokens()) { s = tkn.GetNextToken(); - if ( #ifdef __WXMSW__ - s == wxString(wxT("win")) -#elif defined(__UNIX__) - s == wxString(wxT("unix")) -#elif defined(__MAC__) - s == wxString(wxT("mac")) -#elif defined(__OS2__) - s == wxString(wxT("os2")) -#else - FALSE + if (s == wxT("win")) isok = true; #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; } } diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index 52d9881e13..e5dc727914 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -283,19 +283,21 @@ static void ProcessPlatformProperty(wxXmlNode *node) while (tkn.HasMoreTokens()) { s = tkn.GetNextToken(); - if ( #ifdef __WXMSW__ - s == wxString(wxT("win")) -#elif defined(__UNIX__) - s == wxString(wxT("unix")) -#elif defined(__MAC__) - s == wxString(wxT("mac")) -#elif defined(__OS2__) - s == wxString(wxT("os2")) -#else - FALSE + if (s == wxT("win")) isok = true; #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; } }