reverted two previous Julian's changes, they were incorrect

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp
index b97af0c98b6d13711c27690fd290733f19247999..4b4e47e045eb2abf31da476a0fcfd802427a97ee 100644 (file)
--- a/src/common/xpmdecod.cpp
+++ b/src/common/xpmdecod.cpp
@@ -551,13 +551,7 @@ static bool GetRGBFromName(const char *inname, bool *isNone,
         return TRUE;
     }
 
-#ifdef __WXWINCE__
-    // TODO: is this right? How come it compiles on other
-    // platforms?
-    name = (char*) wxStrdup((wxChar*) inname);
-#else
-    name = wxStrdup(inname);
-#endif
+    name = strdup(inname);
 
     // theRGBRecords[] has no names with spaces, and no grey, but a
     // lot of gray...
@@ -644,7 +638,7 @@ static const char *ParseColor(const char *data)
         {
             if ( *r != *q )
                 continue;
-            if ( !wxIsspace((int) (*(r - 1))) )
+            if ( !isspace((int) (*(r - 1))) )
                 continue;
             p = r;
             for (;;)