added cw6 fixes and patrick's patches

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

diff --git a/include/wx/setup.h b/include/wx/setup.h
index aeadc419668d66d572a9db7a4a7f785bb1432d87..a38f59eb9f461507f64eb9caf7cb69593ba461ff 100644 (file)
--- a/include/wx/setup.h
+++ b/include/wx/setup.h
@@ -16,24 +16,45 @@
 #endif
 
 #ifdef __WXBASE__
+#if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__)
+#include "wx/based/setup.h"
+#else
 #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(__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"
+#else
 #include "wx/motif/setup.h"
+#endif
+
 #elif defined(__WXPM__)
 #include "wx/os2/setup.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/setup.h"
+
 #elif defined(__WXGTK__)
+#if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__)
+#include "wx/gtkd/setup.h"
+#else
 #include "wx/gtk/setup.h"
 #endif
 
+#endif
 #endif
        /* _WX_SETUP_H_BASE_ */