Headers cleaning.

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 8aaa475d374431da8ad945b2e3efd3b8a434aceb..5072accba8653325fc3099f48f550db9ee3befb8 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1011,6 +1011,18 @@
 #   endif
 #endif /* wxUSE_CHOICEBOOK */
 
 #   endif
 #endif /* wxUSE_CHOICEBOOK */
 

+/* don't attempt to use native status bar on the platforms not having it */
+#ifndef wxUSE_NATIVE_STATUSBAR
+#   define wxUSE_NATIVE_STATUSBAR 0
+#elif wxUSE_NATIVE_STATUSBAR
+#   if defined(__WXUNIVERSAL__) || !( defined(__WXMSW__) || \
+                                      defined(__WXMAC__) || \
+                                      defined(__WXPALMOS__) )
+#       undef wxUSE_NATIVE_STATUSBAR
+#       define wxUSE_NATIVE_STATUSBAR 0
+#   endif
+#endif
+

 /* wxUniv-specific dependencies */
 #if defined(__WXUNIVERSAL__)
 #   if (wxUSE_COMBOBOX || wxUSE_MENUS) && !wxUSE_POPUPWIN
 /* wxUniv-specific dependencies */
 #if defined(__WXUNIVERSAL__)
 #   if (wxUSE_COMBOBOX || wxUSE_MENUS) && !wxUSE_POPUPWIN


@@ -1145,26 +1157,6 @@
 #       endif
 #   endif  /* wxUSE_DYNAMIC_LOADER */
 
 #       endif
 #   endif  /* wxUSE_DYNAMIC_LOADER */
 

-#   if !wxUSE_ON_FATAL_EXCEPTION
-#       if wxUSE_CRASHREPORT
-#           ifdef wxABORT_ON_CONFIG_ERROR
-#               error "wxUSE_CRASHREPORT requires wxUSE_ON_FATAL_EXCEPTION"
-#           else
-#               undef wxUSE_CRASHREPORT
-#               define wxUSE_CRASHREPORT 0
-#           endif
-#       endif
-
-#       if wxUSE_STACKWALKER
-#           ifdef wxABORT_ON_CONFIG_ERROR
-#               error "wxUSE_STACKWALKER requires wxUSE_ON_FATAL_EXCEPTION"
-#           else
-#               undef wxUSE_STACKWALKER
-#               define wxUSE_STACKWALKER 0
-#           endif
-#       endif
-#   endif /* wxUSE_ON_FATAL_EXCEPTION */
-

 #endif /* wxMSW */
 
 /* wxMAC-specific dependencies */
 #endif /* wxMSW */
 
 /* wxMAC-specific dependencies */