use different strings for wchar_t and UTF-8-based Unicode builds

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 1ea7d95e192dae4107a6da42b82fd8dfd2f3b6dd..36095513db17d5cd3df48ef1384e32fc6813f5e5 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -299,14 +299,6 @@
 #   endif
 #endif /* wxUSE_VARIANT */
 
 #   endif
 #endif /* wxUSE_VARIANT */
 

-#ifndef wxUSE_WEAKREF
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_WEAKREF must be defined."
-#   else
-#       define wxUSE_WEAKREF 0
-#   endif
-#endif /* wxUSE_WEAKREF */
-

 #ifndef wxUSE_XLOCALE
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_XLOCALE must be defined."
 #ifndef wxUSE_XLOCALE
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_XLOCALE must be defined."


@@ -641,7 +633,7 @@
 #endif /* !defined(wxUSE_HTML) */
 
 #ifndef wxUSE_LIBMSPACK
 #endif /* !defined(wxUSE_HTML) */
 
 #ifndef wxUSE_LIBMSPACK

-#   ifndef __UNIX__
+#   if !defined(__UNIX__) || defined(__WXPALMOS__)

         /* set to 0 on platforms that don't have libmspack */
 #       define wxUSE_LIBMSPACK 0
 #   else
         /* set to 0 on platforms that don't have libmspack */
 #       define wxUSE_LIBMSPACK 0
 #   else


@@ -1031,7 +1023,7 @@
 #elif defined(__WXGTK__)
 #  include "wx/gtk/chkconf.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXGTK__)
 #  include "wx/gtk/chkconf.h"
 #elif defined(__WXMAC__)

-#  include "wx/mac/chkconf.h"
+#  include "wx/osx/chkconf.h"

 #elif defined(__OS2__)
 #  include "wx/os2/chkconf.h"
 #elif defined(__WXMGL__)
 #elif defined(__OS2__)
 #  include "wx/os2/chkconf.h"
 #elif defined(__WXMGL__)