Remove a couple duplicate feature checks, and check for defines before setting them...

[wxWidgets.git] / utils / ifacecheck / src / xmlparser.cpp

diff --git a/utils/ifacecheck/src/xmlparser.cpp b/utils/ifacecheck/src/xmlparser.cpp
index 2209075bd6b3a22c6e6422693ad1fc38810e1f68..7b29c794ff21643e8d27cad9d54d6499b71d8b5c 100644 (file)
--- a/utils/ifacecheck/src/xmlparser.cpp
+++ b/utils/ifacecheck/src/xmlparser.cpp
@@ -520,7 +520,7 @@ bool getMemberIDs(wxClassMemberIdHashMap* map, wxClass* p, const wxStringCharTyp
     while (curpos < end)
     {
         // curpos always points to the underscore of the next token to parse:
     while (curpos < end)
     {
         // curpos always points to the underscore of the next token to parse:

-#if wxUSE_UNICODE_UTF8
+#if wxUSE_UNICODE_WCHAR

         unsigned long id = wcstoul(curpos+1, &nexttoken, GCCXML_BASE);
 #else
         unsigned long id = strtoul(curpos+1, &nexttoken, GCCXML_BASE);
         unsigned long id = wcstoul(curpos+1, &nexttoken, GCCXML_BASE);
 #else
         unsigned long id = strtoul(curpos+1, &nexttoken, GCCXML_BASE);