added wxConvFileName which is a variable, not define as wxConvFile; added comments...

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index d93f2eab61b2429d46085ada1f4c176ce13f4292..1de81cba3d524208f532b0facf4c573fd90d1616 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -17,6 +17,8 @@
 
 #if defined(__WXPALMOS__)
 #  include "wx/palmos/chkconf.h"
 
 #if defined(__WXPALMOS__)
 #  include "wx/palmos/chkconf.h"

+#elif defined(__WXWINCE__)
+#  include "wx/msw/wince/chkconf.h"

 #elif defined(__WXMSW__)
 #  include "wx/msw/chkconf.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXMSW__)
 #  include "wx/msw/chkconf.h"
 #elif defined(__WXMAC__)


@@ -54,6 +56,12 @@
 #   define wxUSE_EXCEPTIONS 0
 #endif /* wxNO_EXCEPTIONS */
 
 #   define wxUSE_EXCEPTIONS 0
 #endif /* wxNO_EXCEPTIONS */
 

+/* we also must disable exceptions if compiler doesn't support them */
+#if defined(_MSC_VER) && !defined(_CPPUNWIND)
+#   undef wxUSE_EXCEPTIONS
+#   define wxUSE_EXCEPTIONS 0
+#endif /* VC++ without exceptions support */
+

 
 /*
    tests for non GUI features
 
 /*
    tests for non GUI features


@@ -170,6 +178,14 @@
 #   endif
 #endif /* !defined(wxUSE_REGEX) */
 
 #   endif
 #endif /* !defined(wxUSE_REGEX) */
 

+#ifndef wxUSE_STDPATHS
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_STDPATHS must be defined."
+#   else
+#       define wxUSE_STDPATHS 1
+#   endif
+#endif /* !defined(wxUSE_STDPATHS) */
+

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