Finally fixed control scrolling

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index a42d90a1391783fc5533af1ceee0f53f3cd0fd60..f7969c189fa2818143067d7f5151ad2be3a92ecf 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -83,14 +83,6 @@
    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 */
@@ -125,6 +117,14 @@
 #   endif
 #endif /* !defined(wxUSE_FILESYSTEM) */
 
+#ifndef wxUSE_FS_ARCHIVE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_FS_ARCHIVE must be defined."
+#   else
+#       define wxUSE_FS_ARCHIVE 0
+#   endif
+#endif /* !defined(wxUSE_FS_ARCHIVE) */
+
 /* don't give an error about this one yet, it's not fully implemented */
 #ifndef wxUSE_FSVOLUME
 #   define wxUSE_FSVOLUME 0
@@ -432,6 +432,14 @@
 #   endif
 #endif /* !defined(wxUSE_CLIPBOARD) */
 
+#ifndef wxUSE_COLLPANE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_COLLPANE must be defined."
+#   else
+#       define wxUSE_COLLPANE 0
+#   endif
+#endif /* !defined(wxUSE_COLLPANE) */
+
 #ifndef wxUSE_COLOURDLG
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_COLOURDLG must be defined."
@@ -964,16 +972,16 @@
    check consistency of the settings
  */
 
-#if WXWIN_COMPATIBILITY_2_4
-#   if !WXWIN_COMPATIBILITY_2_6
+#if WXWIN_COMPATIBILITY_2_6
+#   if !WXWIN_COMPATIBILITY_2_8
 #       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "2.4.X compatibility requires 2.6.X compatibility"
+#           error "2.6.X compatibility requires 2.8.X compatibility"
 #       else
-#           undef WXWIN_COMPATIBILITY_2_6
-#           define WXWIN_COMPATIBILITY_2_6 1
+#           undef WXWIN_COMPATIBILITY_2_8
+#           define WXWIN_COMPATIBILITY_2_8 1
 #       endif
 #   endif
-#endif /* WXWIN_COMPATIBILITY_2_4 */
+#endif /* WXWIN_COMPATIBILITY_2_6 */
 
 #if wxUSE_ARCHIVE_STREAMS
 #   if !wxUSE_DATETIME
@@ -1051,6 +1059,25 @@
 #   endif
 #endif /* wxUSE_HTML */
 
+#if wxUSE_FS_ARCHIVE
+#   if !wxUSE_FILESYSTEM
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxArchiveFSHandler requires wxFileSystem"
+#       else
+#           undef wxUSE_FILESYSTEM
+#           define wxUSE_FILESYSTEM 1
+#       endif
+#   endif
+#   if !wxUSE_ARCHIVE_STREAMS
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxArchiveFSHandler requires wxArchive"
+#       else
+#           undef wxUSE_ARCHIVE_STREAMS
+#           define wxUSE_ARCHIVE_STREAMS 1
+#       endif
+#   endif
+#endif /* wxUSE_FS_ARCHIVE */
+
 #if wxUSE_FILESYSTEM
 #   if !wxUSE_STREAMS
 #       ifdef wxABORT_ON_CONFIG_ERROR
@@ -1064,8 +1091,10 @@
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "wxUSE_FILESYSTEM requires either wxUSE_FILE or wxUSE_FFILE"
 #       else
-#           undef wxUSE_FILESYSTEM
-#           define wxUSE_FILESYSTEM 0
+#           undef wxUSE_FILE
+#           define wxUSE_FILE 1
+#           undef wxUSE_FFILE
+#           define wxUSE_FFILE 1
 #       endif
 #   endif
 #endif /* wxUSE_FILESYSTEM */
@@ -1168,16 +1197,16 @@
 #   endif
 #endif /* wxUSE_ZIPSTREAM */
 
-#if wxUSE_BACKINGFILE
-#   if !wxUSE_STREAMS || (!wxUSE_FILE && !wxUSE_FFILE)
+#if wxUSE_TARSTREAM
+#   if !wxUSE_ARCHIVE_STREAMS
 #       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxBackingFile requires wxStream and wxFile or wxFFile"
+#           error "wxTar requires wxArchive"
 #       else
-#           undef wxUSE_BACKINGFILE
-#           define wxUSE_BACKINGFILE 1
+#           undef wxUSE_ARCHIVE_STREAMS
+#           define wxUSE_ARCHIVE_STREAMS 1
 #       endif
 #   endif
-#endif /* wxUSE_ZIPSTREAM */
+#endif /* wxUSE_TARSTREAM */
 
 /* the rest of the tests is for the GUI settings only */
 #if wxUSE_GUI
@@ -1245,8 +1274,20 @@
 #define wxUSE_BOOKCTRL (wxUSE_NOTEBOOK || \
                         wxUSE_LISTBOOK || \
                         wxUSE_CHOICEBOOK || \
+                        wxUSE_TOOLBOOK || \
                         wxUSE_TREEBOOK)
 
+#if wxUSE_COLLPANE
+#   if !wxUSE_BUTTON || !wxUSE_STATLINE
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_COLLPANE requires wxUSE_BUTTON and wxUSE_STATLINE"
+#       else
+#           undef wxUSE_COLLPANE
+#           define wxUSE_COLLPANE 0
+#       endif
+#   endif
+#endif /* wxUSE_COLLPANE */
+
 #if wxUSE_LISTBOOK
 #   if !wxUSE_LISTCTRL
 #       ifdef wxABORT_ON_CONFIG_ERROR
@@ -1269,6 +1310,17 @@
 #   endif
 #endif /* wxUSE_CHOICEBOOK */
 
+#if wxUSE_TOOLBOOK
+#   if !wxUSE_TOOLBAR
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxToolbook requires wxToolBar"
+#       else
+#           undef wxUSE_TOOLBAR
+#           define wxUSE_TOOLBAR 1
+#       endif
+#   endif
+#endif /* wxUSE_TOOLBOOK */
+
 #if !wxUSE_ODCOMBOBOX
 #   if wxUSE_BITMAPCOMBOBOX
 #       error "wxBitmapComboBox requires wxOwnerDrawnComboBox"
@@ -1437,6 +1489,18 @@
 #   endif
 #endif /* wxUSE_HELP */
 
+#if wxUSE_MS_HTML_HELP
+    /*
+        this doesn't make sense for platforms other than MSW but we still
+        define it in wx/setup_inc.h so don't complain if it happens to be
+        defined under another platform but just silently fix it.
+     */
+#   ifndef __WXMSW__
+#       undef wxUSE_MS_HTML_HELP
+#       define wxUSE_MS_HTML_HELP 0
+#   endif
+#endif /* wxUSE_MS_HTML_HELP */
+
 #if wxUSE_WXHTML_HELP
 #   if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX || !wxUSE_NOTEBOOK || !wxUSE_SPINCTRL
 #       ifdef wxABORT_ON_CONFIG_ERROR
@@ -1740,15 +1804,6 @@
 #   endif
 #endif /* wxUSE_CLIPBOARD */
 
-#if wxUSE_WX_RESOURCES && !wxUSE_PROLOGIO
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxr resources require PrologIO"
-#   else
-#       undef wxUSE_PROLOGIO
-#       define wxUSE_PROLOGIO 1
-#   endif
-#endif /* wxUSE_WX_RESOURCES */
-
 #if wxUSE_XRC && !wxUSE_XML
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_XRC requires wxUSE_XML"