X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/07158944d86fc3895c24a5a9848616405d3d91db..1e255b00ced5114d9b599cd66cd9d737686cec94:/include/wx/chkconf.h

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index a1208027bd..1de81cba3d 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -17,6 +17,8 @@
 
 #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__)
@@ -54,6 +56,12 @@
 #   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