change superflous elif to else

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

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index 31ded4713bbc022b0329cee7f3dc23530d4baef7..b0d3e253e386e82904353b43f746180540be63d4 100644 (file)
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -36,13 +36,20 @@
 #endif
 
 /*
- * GCC does not have SEH (__try/__catch)
+ * All of the settings below require SEH support (__try/__catch) and can't work
+ * without it.
  */
-
-#if defined(__GNUG__)
+#if !defined(_MSC_VER) && \
+    (!defined(__BORLANDC__) || __BORLANDC__ < 0x0550)
     #undef wxUSE_ON_FATAL_EXCEPTION
     #define wxUSE_ON_FATAL_EXCEPTION 0
-#endif
+
+    #undef wxUSE_CRASHREPORT
+    #define wxUSE_CRASHREPORT 0
+
+    #undef wxUSE_STACKWALKER
+    #define wxUSE_STACKWALKER 0
+#endif // compiler doesn't support SEH
 
 /*
  * wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior
@@ -134,6 +141,14 @@
     #endif
 #endif
 
+/* Disable controls for pointing devices */
+#if defined(__SMARTPHONE__)
+    #undef wxUSE_NOTEBOOK
+    #undef wxUSE_LISTBOOK
+    #define wxUSE_NOTEBOOK 0
+    #define wxUSE_LISTBOOK 0
+#endif
+
 #endif
     /* _WX_MSW_CHKCONF_H_ */