From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 7 Jun 2005 18:29:41 +0000 (+0000)
Subject: define wxUSE_UNICODE before including wx/chkconf.h which uses it
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/79e7089470c3523bd4a728156f4910e9e2e8ce9c

define wxUSE_UNICODE before including wx/chkconf.h which uses it


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 96d9541774..59b66e8ff7 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -259,9 +259,6 @@
  */
 #include "wx/setup.h"
 
-/* check the consistency of the settings in setup.h */
-#include "wx/chkconf.h"
-
 /*
    adjust the Unicode setting: wxUSE_UNICODE should be defined as 0 or 1
    and is used by wxWidgets, _UNICODE and/or UNICODE may be defined or used by
@@ -292,6 +289,15 @@
 // otherwise MSL headers bring in WIN32 dependant APIs
 #undef UNICODE
 #endif
+
+
+/*
+   check the consistency of the settings in setup.h: note that this must be
+   done after setting wxUSE_UNICODE correctly as it is used in wx/chkconf.h
+ */
+#include "wx/chkconf.h"
+
+
 /*
    some compilers don't support iostream.h any longer, while some of theme
    are not updated with <iostream> yet, so override the users setting here