Removed semi-colons off the end of two macro statement lines so that compilation...

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

diff --git a/include/wx/setup.h b/include/wx/setup.h
index a38f59eb9f461507f64eb9caf7cb69593ba461ff..a4bf2e32c5223b284e0cd50f9ed247741cc0b704 100644 (file)
--- a/include/wx/setup.h
+++ b/include/wx/setup.h
@@ -15,7 +15,18 @@
 #error No __WXxxx__ define set! Please define one of __WXBASE__,__WXGTK__,__WXMSW__,__WXMOTIF__,__WXMAC__,__WXQT__,__WXPM__,__WXSTUBS__
 #endif
 
 #error No __WXxxx__ define set! Please define one of __WXBASE__,__WXGTK__,__WXMSW__,__WXMOTIF__,__WXMAC__,__WXQT__,__WXPM__,__WXSTUBS__
 #endif
 

-#ifdef __WXBASE__
+/*
+  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"
+#else
+#include "wx/univ/setup.h"
+#endif
+
+#elif defined(__WXBASE__)

 #if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__)
 #include "wx/based/setup.h"
 #else
 #if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__)
 #include "wx/based/setup.h"
 #else


@@ -56,5 +67,18 @@
 #endif
 
 #endif
 #endif
 
 #endif

-#endif
-       /* _WX_SETUP_H_BASE_ */
+
+#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_ */