Unicode compilation fixes.

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

diff --git a/include/wx/setup.h b/include/wx/setup.h
index 0ccee557d00e2346f15bed7b2b1279aa356f5541..4450f67890ed51a3122daa2155dee7eb562b0db6 100644 (file)
--- a/include/wx/setup.h
+++ b/include/wx/setup.h
@@ -11,12 +11,14 @@
 
 /* compatibility code, to be removed asap: */
 
-#if !defined(__WXBASE__) && !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXQT__) && !defined(__WXSTUBS__) && !defined(__WXMAC__) && !defined(__WXPM__)
-#error No __WXxxx__ define set! Please define one of __WXBASE__,__WXGTK__,__WXMSW__,__WXMOTIF__,__WXMAC__,__WXQT__,__WXPM__,__WXSTUBS__
+#if !defined(__WXBASE__) && !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXSTUBS__) && !defined(__WXMAC__) && !defined(__WXPM__)
+#error No __WXxxx__ define set! Please define one of __WXBASE__,__WXMSW__,__WXGTK__,__WXMOTIF__,__WXSTUBS__,__WXMAC__,__WXPM__
 #endif
 
-// wxUniversal is defined together with one of other ports, so test for it
-// first
+/*
+  wxUniversal is defined together with one of other ports, so test for it
+  first
+ */
 #ifdef __WXUNIVERSAL__
 #if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__)
 #include "wx/univd/setup.h"
@@ -38,13 +40,6 @@
 #elif defined(__WXMAC__)
 #include "wx/mac/setup.h"
 
-#elif defined(__WXQT__)
-#if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__)
-#include "wx/qtd/setup.h"
-#else
-#include "wx/qt/setup.h"
-#endif
-
 #elif defined(__WXMOTIF__)
 #if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__)
 #include "wx/motifd/setup.h"
@@ -68,4 +63,16 @@
 
 #include "wx/chkconf.h"
 
+/*
+   define some constants identifying wxWindows version in more details than
+   just the version number
+ */
+
+/* wxLogChain class available */
+#define wxHAS_LOG_CHAIN
+
+/* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
+#undef wxHAS_WORKING_GTK_DC_BLIT
+
 #endif /* _WX_SETUP_H_BASE_ */
+