X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d37334f0ee85da8565fd4bf0f94ca952e702db8..1ab48408d13344ff0e46bd397d7dc89889e48fba:/include/wx/chkconf.h

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index ba91775a20..34ee4789e9 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -35,6 +35,10 @@
 #  include "wx/x11/chkconf.h"
 #endif
 
+#ifdef __WXUNIVERSAL__
+#   include "wx/univ/chkconf.h"
+#endif
+
 /*
    this global setting determines what should we do if the setting FOO
    requires BAR and BAR is not set: we can either silently unset FOO as well
@@ -79,6 +83,14 @@
    please keep the options in alphabetical order!
  */
 
+#ifndef wxUSE_BACKINGFILE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_BACKINGFILE must be defined."
+#   else
+#       define wxUSE_BACKINGFILE 0
+#   endif
+#endif /* !defined(wxUSE_BACKINGFILE) */
+
 #ifndef wxUSE_CRASHREPORT
     /* this one is special: as currently it is Windows-only, don't force it
        to be defined on other platforms */
@@ -308,6 +320,14 @@
    preprocessor about invalid integer expression
  */
 
+#ifndef wxUSE_ABOUTDLG
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_ABOUTDLG must be defined."
+#   else
+#       define wxUSE_ABOUTDLG 0
+#   endif
+#endif /* !defined(wxUSE_ABOUTDLG) */
+
 #ifndef wxUSE_ACCEL
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_ACCEL must be defined."
@@ -316,6 +336,14 @@
 #   endif
 #endif /* !defined(wxUSE_ACCEL) */
 
+#ifndef wxUSE_ANIMATIONCTRL
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_ANIMATIONCTRL must be defined."
+#   else
+#       define wxUSE_ANIMATIONCTRL 0
+#   endif
+#endif /* !defined(wxUSE_ANIMATIONCTRL) */
+
 #ifndef wxUSE_BITMAPCOMBOBOX
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_BITMAPCOMBOBOX must be defined."
@@ -532,6 +560,15 @@
 #   endif
 #endif /* !defined(wxUSE_GAUGE) */
 
+#ifndef wxUSE_GRAPHICS_CONTEXT
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_GRAPHICS_CONTEXT must be defined."
+#   else
+#       define wxUSE_GRAPHICS_CONTEXT 0
+#   endif
+#endif /* !defined(wxUSE_GRAPHICS_CONTEXT) */
+
+
 #ifndef wxUSE_GRID
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_GRID must be defined."
@@ -1023,6 +1060,14 @@
 #           define wxUSE_STREAMS 1
 #       endif
 #   endif
+#   if !wxUSE_FILE && !wxUSE_FFILE
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_FILESYSTEM requires either wxUSE_FILE or wxUSE_FFILE"
+#       else
+#           undef wxUSE_FILESYSTEM
+#           define wxUSE_FILESYSTEM 0
+#       endif
+#   endif
 #endif /* wxUSE_FILESYSTEM */
 
 #if wxUSE_FS_INET
@@ -1123,6 +1168,17 @@
 #   endif
 #endif /* wxUSE_ZIPSTREAM */
 
+#if wxUSE_BACKINGFILE
+#   if !wxUSE_STREAMS || (!wxUSE_FILE && !wxUSE_FFILE)
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxBackingFile requires wxStream and wxFile or wxFFile"
+#       else
+#           undef wxUSE_BACKINGFILE
+#           define wxUSE_BACKINGFILE 0
+#       endif
+#   endif
+#endif /* wxUSE_BACKINGFILE */
+
 /* the rest of the tests is for the GUI settings only */
 #if wxUSE_GUI
 
@@ -1174,19 +1230,22 @@
 #    endif
 #endif /* wxUSE_BMPBUTTON */
 
-#if wxUSE_NOTEBOOK || wxUSE_LISTBOOK || wxUSE_CHOICEBOOK
-#   if defined(wxUSE_BOOKCTRL) && !wxUSE_BOOKCTRL
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxUSE_BOOKCTRL must be set."
-#       else
-#           undef wxUSE_BOOKCTRL
-#       endif
+/*
+   wxUSE_BOOKCTRL should be only used if any of the controls deriving from it
+   are used
+ */
+#ifdef wxUSE_BOOKCTRL
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_BOOKCTRL is defined automatically, don't define it"
+#   else
+#       undef wxUSE_BOOKCTRL
 #   endif
+#endif
 
-#   ifndef wxUSE_BOOKCTRL
-#       define wxUSE_BOOKCTRL 1
-#   endif
-#endif /* wxUSE_NOTEBOOK */
+#define wxUSE_BOOKCTRL (wxUSE_NOTEBOOK || \
+                        wxUSE_LISTBOOK || \
+                        wxUSE_CHOICEBOOK || \
+                        wxUSE_TREEBOOK)
 
 #if wxUSE_LISTBOOK
 #   if !wxUSE_LISTCTRL
@@ -1231,59 +1290,15 @@
 #   endif
 #endif
 
-/* wxUniv-specific dependencies */
-#if defined(__WXUNIVERSAL__)
-#   if (wxUSE_COMBOBOX || wxUSE_MENUS) && !wxUSE_POPUPWIN
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxUSE_POPUPWIN must be defined to use comboboxes/menus"
-#       else
-#           undef wxUSE_POPUPWIN
-#           define wxUSE_POPUPWIN 1
-#       endif
+#if wxUSE_GRAPHICS_CONTEXT && !wxUSE_GEOMETRY
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_GRAPHICS_CONTEXT requires wxUSE_GEOMETRY"
+#   else
+#       undef wxUSE_GRAPHICS_CONTEXT
+#       define wxUSE_GRAPHICS_CONTEXT 0
 #   endif
+#endif /* wxUSE_GRAPHICS_CONTEXT */
 
-#   if wxUSE_COMBOBOX
-#      if !wxUSE_LISTBOX
-#           ifdef wxABORT_ON_CONFIG_ERROR
-#               error "wxComboBox requires wxListBox in wxUniversal"
-#           else
-#               undef wxUSE_LISTBOX
-#               define wxUSE_LISTBOX 1
-#           endif
-#      endif
-#   endif /* wxUSE_COMBOBOX */
-
-#   if wxUSE_RADIOBTN
-#      if !wxUSE_CHECKBOX
-#           ifdef wxABORT_ON_CONFIG_ERROR
-#               error "wxUSE_RADIOBTN requires wxUSE_CHECKBOX in wxUniversal"
-#           else
-#               undef wxUSE_CHECKBOX
-#               define wxUSE_CHECKBOX 1
-#           endif
-#      endif
-#   endif /* wxUSE_RADIOBTN */
-
-#   if wxUSE_TEXTCTRL
-#       if !wxUSE_CARET
-#           ifdef wxABORT_ON_CONFIG_ERROR
-#               error "wxTextCtrl requires wxCaret in wxUniversal"
-#           else
-#               undef wxUSE_CARET
-#               define wxUSE_CARET 1
-#           endif
-#       endif /* wxUSE_CARET */
-
-#       if !wxUSE_SCROLLBAR
-#           ifdef wxABORT_ON_CONFIG_ERROR
-#               error "wxTextCtrl requires wxScrollBar in wxUniversal"
-#           else
-#               undef wxUSE_SCROLLBAR
-#               define wxUSE_SCROLLBAR 1
-#           endif
-#       endif /* wxUSE_SCROLLBAR */
-#   endif /* wxUSE_TEXTCTRL */
-#endif /* __WXUNIVERSAL__ */
 
 /* wxGTK-specific dependencies */
 #ifdef __WXGTK__