make wxSortedArrayString::Sort() and Insert() private in STL build (closes #10947)

[wxWidgets.git] / include / wx / build.h

diff --git a/include/wx/build.h b/include/wx/build.h
index e660e39114000d325bb45fc1a03f1d6e94cdb675..5a0fb9d871b52b5f7200f558a98fbd08314ba45e 100644 (file)
--- a/include/wx/build.h
+++ b/include/wx/build.h
@@ -48,8 +48,10 @@
     #define __WX_BO_DEBUG "no debug"
 #endif
 
     #define __WX_BO_DEBUG "no debug"
 #endif
 

-#if wxUSE_UNICODE
-    #define __WX_BO_UNICODE "Unicode"
+#if wxUSE_UNICODE_UTF8
+    #define __WX_BO_UNICODE "UTF-8"
+#elif wxUSE_UNICODE_WCHAR
+    #define __WX_BO_UNICODE "wchar_t"

 #else
     #define __WX_BO_UNICODE "ANSI"
 #endif
 #else
     #define __WX_BO_UNICODE "ANSI"
 #endif