Resource file updates and setup to configure for generic dirdlg.

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

diff --git a/include/wx/setup.h b/include/wx/setup.h
index e6bfe68c4f514be2844754d11d6c7e6c67fac680..8c95388a21e3c96e40d3335663260164a11e7b15 100644 (file)
--- a/include/wx/setup.h
+++ b/include/wx/setup.h
@@ -1,77 +1,14 @@
 /*
- * The main configuration file for wxWindows.
+ * wx/setup.h
  *
- * 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
+ * This file should not normally be used, except where makefiles
+ * have not yet been adjusted to take into account of the new scheme
+ * whereby a setup.h is created under the lib directory.
  */
 
-#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(__WXSTUBS__) && !defined(__WXMAC__) && !defined(__WXPM__)
-#error No __WXxxx__ define set! Please define one of __WXBASE__,__WXMSW__,__WXGTK__,__WXMOTIF__,__WXSTUBS__,__WXMAC__,__WXPM__
-#endif
-
-/*
-  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__)
+#ifdef __WXMSW__
 #include "wx/msw/setup.h"
-#elif defined(__WXMAC__)
-#include "wx/mac/setup.h"
-
-#elif defined(__WXMOTIF__)
-#if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__)
-#include "wx/motifd/setup.h"
 #else
-#include "wx/motif/setup.h"
+#error Please adjust your include path to pick up the wx/setup.h file under lib first.
 #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
-
-#include "wx/chkconf.h"
-
-/*
-   define some constants identifying wxWindows version in more details than
-   just the version number
- */
-
-// wxLogChain class available
-#define wxHAS_LOG_CHAIN
-
-// define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK
-#undef wxHAS_WORKING_GTK_DC_BLIT
-
-#endif /* _WX_SETUP_H_BASE_ */