Merge branch 'always-use-wchar_t'

Remove obsolete wxUSE_WCHAR_T option, it must be always 1. See https://github.com/wxWidgets/wxWidgets/pull/1624
2019-11-01 14:32:42 +01:00
parent 5ef1e77c79 d7a640933d
commit be83879733
16 changed files with 15 additions and 82 deletions
--- a/build/cmake/init.cmake
+++ b/build/cmake/init.cmake
@@ -194,9 +194,6 @@ endif()

 # Constants for setup.h creation
 set(wxUSE_STD_DEFAULT ON)
-if(wxUSE_UNICODE)
-    set(wxUSE_WCHAR_T ON)
-endif()
 if(NOT wxUSE_EXPAT)
    set(wxUSE_XRC OFF)
 endif()
--- a/build/cmake/setup.h.in
+++ b/build/cmake/setup.h.in
@@ -182,8 +182,6 @@
    #cmakedefine01 wxUSE_UNICODE
 #endif

-#cmakedefine01 wxUSE_WCHAR_T
-

 #cmakedefine01 wxUSE_EXCEPTIONS