final cleanup of string conversion with null characters (hopefully :))

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 49a1248b526518ab446600a95d97e580ac77807d..8b8a8c77b7dee9d1126360895520d540883a5fad 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -15,7 +15,9 @@
    Compiler-specific checking.
  */
 
-#if defined(__WXMSW__)
+#if defined(__PALMOS__)
+#  include "wx/palmos/chkconf.h"
+#elif defined(__WXMSW__)
 #  include "wx/msw/chkconf.h"
 #elif defined(__WXMAC__)
 #  include "wx/mac/chkconf.h"
@@ -1170,12 +1172,12 @@
 #endif /* wxMGL */
 
 /* Hopefully we can emulate these dialogs in due course */
-#ifdef __SMARTPHONE__
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
 #   ifdef wxUSE_COLOURDLG
 #       undef wxUSE_COLOURDLG
 #       define wxUSE_COLOURDLG 0
 #   endif
-#endif /* __SMARTPHONE__ */
+#endif /* __SMARTPHONE__ && __WXWINCE__ */
 
 
 /* generic controls dependencies */
@@ -1589,7 +1591,7 @@
 #       undef wxUSE_XRC
 #       define wxUSE_XRC 0
 #   endif
-#endif /* wxUSE_UNICODE_XRC */
+#endif /* wxUSE_XRC */
 
 #endif /* wxUSE_GUI */