Fixed some warnings (don't know why dialoged Makefile is being committed)

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

diff --git a/include/wx/setup.h b/include/wx/setup.h
index f0afb8965580fc601b49450f6a6267a6fff08272..a38f59eb9f461507f64eb9caf7cb69593ba461ff 100644 (file)
--- a/include/wx/setup.h
+++ b/include/wx/setup.h
@@ -11,65 +11,50 @@
 
 /* compatibility code, to be removed asap: */
 
-#if !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXQT__) && !defined(__WXSTUBS__) && !defined(__WXMAC__) && !defined(__WXPM__)
-#error No __WXxxx__ define set! Please define one of __WXGTK__,__WXMSW__,__WXMOTIF__,__WXMAC__,__WXQT__,__WXPM__,__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
 
-#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"
 #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
 
-/*
- * Compatibility defines: note that, in general, there is a a reason for not
- * compatible changes, so you should try to avoid defining WXWIN_COMPATIBILITY
- * and do so only if your program really can't be compiled otherwise.
- */
-
-/*
- * Compatibility with 1.66 API.
- * Level 0: no backward compatibility, all new features
- * Level 1: wxDC, OnSize (etc.) compatibility, but
- * some new features such as event tables
- */
-#define WXWIN_COMPATIBILITY 0
-
-/*
- * wxWindows 2.0 API compatibility. Possible values are:
- * 0:   no backwards compatibility
- * 1:   some backwards compatibility, but if it conflicts with the new
- *      features, use the new code, not the old one
- * 2:   maximum backwards compatiblity: even if compatibility can only be
- *      achieved by disabling new features, do it.
- */
-#define WXWIN_COMPATIBILITY_2 1
-
-/*
- * wxWindows 2.0 uses long for wxPoint/wxRect/wxSize member fields and wxDC
- * method arguments, wxWindows 2.1 and later uses wxCoord typedef which is
- * usually int. Using long leads to (justified) warnings about long to int
- * conversions from some compilers and is, generally speaking, unneeded.
- */
-#define wxUSE_COMPATIBLE_COORD_TYPES 0
-
-/*
- * Maximum compatibility with 2.0 API
- */
-#if WXWIN_COMPATIBILITY_2 == 2
-#undef wxUSE_COMPATIBLE_COORD_TYPES
-#define wxUSE_COMPATIBLE_COORD_TYPES 1
-#endif /* WXWIN_COMPATIBILITY_2_MAX */
-
+#endif
 #endif
        /* _WX_SETUP_H_BASE_ */