Checking for wxUSE_SOCKETS and __GSOCKET_STANDALONE__ should be right, now

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

diff --git a/include/wx/setup.h b/include/wx/setup.h
index bd1963b9ec2b81de0cd0a8f5f7092827702efee3..076a4d4c78fa63135f1016627c35d6f2c1b1334c 100644 (file)
--- a/include/wx/setup.h
+++ b/include/wx/setup.h
@@ -2,10 +2,10 @@
 #ifndef _WX_SETUP_H_BASE_
 #define _WX_SETUP_H_BASE_
 
-// compatibility code, to be removed asap:
+/* 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
 
 #if defined(__WXMSW__)
@@ -16,11 +16,13 @@
 #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__)
-#include "wx/../../install/unix/setup/setup.h"
+#include "wx/gtk/setup.h"
 #endif
 
 #endif
-       // _WX_SETUP_H_BASE_
+       /* _WX_SETUP_H_BASE_ */