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 aeadc419668d66d572a9db7a4a7f785bb1432d87..0ccee557d00e2346f15bed7b2b1279aa356f5541 100644 (file)
--- a/include/wx/setup.h
+++ b/include/wx/setup.h
@@ -15,25 +15,57 @@
 #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

 #include "wx/base/setup.h"
 #include "wx/base/setup.h"

+#endif
+

 #elif defined(__VMS)
 #include "wx_root:[wxwindows]setup.h"
 #elif defined(__WXMSW__)
 #include "wx/msw/setup.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/setup.h"
 #elif defined(__VMS)
 #include "wx_root:[wxwindows]setup.h"
 #elif defined(__WXMSW__)
 #include "wx/msw/setup.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/setup.h"

+

 #elif defined(__WXQT__)
 #elif defined(__WXQT__)

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

 #include "wx/qt/setup.h"
 #include "wx/qt/setup.h"

+#endif
+

 #elif defined(__WXMOTIF__)
 #elif defined(__WXMOTIF__)

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

 #include "wx/motif/setup.h"
 #include "wx/motif/setup.h"

+#endif
+

 #elif defined(__WXPM__)
 #include "wx/os2/setup.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/setup.h"
 #elif defined(__WXPM__)
 #include "wx/os2/setup.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/setup.h"

+

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

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

 #include "wx/gtk/setup.h"
 #endif
 
 #endif
 #include "wx/gtk/setup.h"
 #endif
 
 #endif

-       /* _WX_SETUP_H_BASE_ */
+
+#include "wx/chkconf.h"
+
+#endif /* _WX_SETUP_H_BASE_ */