From b7e8f408c941709a9f1395a1f89da15773cdc889 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 15 Jul 2003 11:04:34 +0000 Subject: [PATCH] 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 --- src/common/xpmdecod.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp index b97af0c98b..4b4e47e045 100644 --- 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 (;;) -- 2.45.2