1. more warnings fixes in gtk/region.cpp and common/tbarsmpl.cpp

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

diff --git a/include/wx/setup.h b/include/wx/setup.h
index 9926f0f0dd8452dff5cc5d27242540aa7c1e19b5..de71dae16b4f9d0e0a4a18389146203118a049eb 100644 (file)
--- a/include/wx/setup.h
+++ b/include/wx/setup.h
@@ -1,14 +1,23 @@
+/*
+ * 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(__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__

 #endif
 
 #endif
 

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


@@ -16,10 +25,12 @@
 #include "wx/qt/setup.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/setup.h"
 #include "wx/qt/setup.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/setup.h"

+#elif defined(__WXPM__)
+#include "wx/os2/setup.h"

 #elif defined(__WXSTUBS__)
 #include "wx/stubs/setup.h"
 #elif defined(__WXGTK__)
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/setup.h"
 #elif defined(__WXGTK__)

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

 #endif
 
 #endif
 #endif
 
 #endif