X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec2ba3aa467939ef341ff08a5778199f22addfb1..c693edf3bc9539378a7ac56d90d41d89c7dc7579:/src/common/string.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 3fc2571a97..1b42fd7893 100644
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -94,6 +94,13 @@ extern const wxChar WXDLLEXPORT *g_szNul = &g_strEmpty.dummy;
 // conditional compilation
 // ----------------------------------------------------------------------------
 
+#if !defined(__WXSW__) && wxUSE_UNICODE
+  #ifdef wxUSE_EXPERIMENTAL_PRINTF
+    #undef wxUSE_EXPERIMENTAL_PRINTF
+  #endif
+  #define wxUSE_EXPERIMENTAL_PRINTF 1
+#endif
+
 // we want to find out if the current platform supports vsnprintf()-like
 // function: for Unix this is done with configure, for Windows we test the
 // compiler explicitly.
@@ -2189,8 +2196,7 @@ static void wxLoadCharacterSets(void)
 	  wxString uni = token.GetNextToken();
 	  // skip whitespace again
 	  while (wxIsEmpty(uni) && token.HasMoreTokens()) uni = token.GetNextToken();
-
-	  if ((hex.Len() > 2) && (hex.GetChar(0) == escchar) && (hex.GetChar(1) == _T('x')) &&
+	  if ((hex.Len() > 2) && (wxString(hex.GetChar(0)) == escchar) && (hex.GetChar(1) == _T('x')) &&
 	      (uni.Left(2) == _T("<U"))) {
 	    hex.MakeUpper(); uni.MakeUpper();
 	    int pos = ::wxHexToDec(hex.Mid(2,2));