renamed port to session for Carbon printing

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

diff --git a/include/wx/setup.h b/include/wx/setup.h
index a38f59eb9f461507f64eb9caf7cb69593ba461ff..0ccee557d00e2346f15bed7b2b1279aa356f5541 100644 (file)
--- a/include/wx/setup.h
+++ b/include/wx/setup.h
@@ -15,7 +15,16 @@
 #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
@@ -56,5 +65,7 @@
 #endif
 
 #endif
-#endif
-       /* _WX_SETUP_H_BASE_ */
+
+#include "wx/chkconf.h"
+
+#endif /* _WX_SETUP_H_BASE_ */