Forgot to update this enhancement from last weekend

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

diff --git a/include/wx/setup.h b/include/wx/setup.h
index 81b9de364c366f191fc7beab08fb30b081436b8e..a38f59eb9f461507f64eb9caf7cb69593ba461ff 100644 (file)
--- a/include/wx/setup.h
+++ b/include/wx/setup.h
@@ -1,28 +1,60 @@
+/*
+ * The main configuration file for wxWindows.
+ *
+ * NB: this file can be included in .c files, so it must be compileable by a C
+ *     compiler - use #ifdef __cplusplus for C++ specific features and avoid
+ *     using C++ style comments
+ */

 
 

-#ifndef __SETUPH_BASE__
-#define __SETUPH_BASE__
-
-// compatibility code, to be removed asap:
-
-#if ! defined(__WXMSW__) && ! defined(__WXGTK__) && ! defined(__WXMOTIF__)
-#  if defined(__WINDOWS__)
-#    define __WXMSW__
-#  elif defined(__GTK__)
-#    define __WXGTK__
-#  elif defined(__MOTIF__)
-#    define __WXMOTIF__
-#  elif defined(__QT__)
-#    define __WXQT__
-#  else
-#    error No __WXxxx__ define set! Please define __WXGTK__,__WXMSW__ or __WXMOTIF__.
-#  endif
+#ifndef _WX_SETUP_H_BASE_
+#define _WX_SETUP_H_BASE_
+
+/* 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__

 #endif
 
 #endif
 

-#if defined(__WXMSW__)
+#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"
 #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
 #else

-#include "wx/../../install/unix/setup/setup.h"
+#include "wx/motif/setup.h"

 #endif
 
 #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
 #endif

-       // __SETUPH_BASE__
+       /* _WX_SETUP_H_BASE_ */