corrected wxGauge to inherit from wxGaugeBase

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

diff --git a/include/wx/setup.h b/include/wx/setup.h
index 54936598ae78667efc1f9093ab10fa9e609bba11..0ccee557d00e2346f15bed7b2b1279aa356f5541 100644 (file)
--- a/include/wx/setup.h
+++ b/include/wx/setup.h
@@ -1,26 +1,71 @@
+/*
+ * 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 _WX_SETUP_H_BASE_
 #define _WX_SETUP_H_BASE_
 
 /* compatibility code, to be removed asap: */
 
 
 #ifndef _WX_SETUP_H_BASE_
 #define _WX_SETUP_H_BASE_
 
 /* compatibility code, to be removed asap: */
 

-#if !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXQT__) && !defined(__WXSTUBS__) && !defined(__WXMAC__)
-#    error No __WXxxx__ define set! Please define one of __WXGTK__,__WXMSW__,__WXMOTIF__,__WXMAC__,__WXQT__,__WXSTUBS__
+#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__)
+// 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"
+#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"
 #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(__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_ */