fixes for Sun CC 5.0 (unlike 4.2 it understands bool)

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

diff --git a/include/wx/setup.h b/include/wx/setup.h
index 81b9de364c366f191fc7beab08fb30b081436b8e..54936598ae78667efc1f9093ab10fa9e609bba11 100644 (file)
--- a/include/wx/setup.h
+++ b/include/wx/setup.h
@@ -1,28 +1,26 @@
 
 

-#ifndef __SETUPH_BASE__
-#define __SETUPH_BASE__
+#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__)
-#  if defined(__WINDOWS__)
-#    define __WXMSW__
-#  elif defined(__GTK__)
-#    define __WXGTK__
-#  elif defined(__MOTIF__)
-#    define __WXMOTIF__
-#  elif defined(__QT__)
-#    define __WXQT__
-#  else
-#    error No __WXxxx__ define set! Please define __WXGTK__,__WXMSW__ or __WXMOTIF__.
-#  endif
+#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__

 #endif
 
 #if defined(__WXMSW__)
 #include "wx/msw/setup.h"
 #endif
 
 #if defined(__WXMSW__)
 #include "wx/msw/setup.h"

-#else
-#include "wx/../../install/unix/setup/setup.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/setup.h"
+#elif defined(__WXQT__)
+#include "wx/qt/setup.h"
+#elif defined(__WXMOTIF__)
+#include "wx/motif/setup.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/setup.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk/setup.h"

 #endif
 
 #endif
 #endif
 
 #endif

-       // __SETUPH_BASE__
+       /* _WX_SETUP_H_BASE_ */