a draft of wxSSBase class - it is yet unused and hopefully doesn't break anything...

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 7a03b31938ffb895405cf0ed7908f8c75d6a05ad..fc214570ba5f2741b6d7e4c9b2d55f4f753cd227 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -19,8 +19,30 @@
  */
 #define wxABORT_ON_CONFIG_ERROR
 
+
+
+/*
+   tests for non GUI features
+ */
+
+#ifndef wxUSE_DYNLIB_CLASS
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_DYNLIB_CLASS must be defined."
+#   else
+#       define wxUSE_DYNLIB_CLASS 0
+#   endif
+#endif /* !defined(wxUSE_DYNLIB_CLASS) */
+
+#ifndef wxUSE_DYNAMIC_LOADER
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_DYNAMIC_LOADER must be defined."
+#   else
+#       define wxUSE_DYNAMIC_LOADER 0
+#   endif
+#endif /* !defined(wxUSE_DYNAMIC_LOADER) */
+
 /*
-   all these tests are for GUI onlu
+   all these tests are for GUI only
  */
 #if wxUSE_GUI
 
@@ -93,6 +115,14 @@
 #   endif
 #endif /* !defined(wxUSE_CHOICE) */
 
+#ifndef wxUSE_CHOICEDLG
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_CHOICEDLG must be defined."
+#   else
+#       define wxUSE_CHOICEDLG 0
+#   endif
+#endif /* !defined(wxUSE_CHOICEDLG) */
+
 #ifndef wxUSE_CLIPBOARD
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_CLIPBOARD must be defined."
@@ -101,6 +131,14 @@
 #   endif
 #endif /* !defined(wxUSE_CLIPBOARD) */
 
+#ifndef wxUSE_COLOURDLG
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_COLOURDLG must be defined."
+#   else
+#       define wxUSE_COLOURDLG 0
+#   endif
+#endif /* !defined(wxUSE_COLOURDLG) */
+
 #ifndef wxUSE_COMBOBOX
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_COMBOBOX must be defined."
@@ -117,6 +155,14 @@
 #   endif
 #endif /* !defined(wxUSE_DATAOBJ) */
 
+#ifndef wxUSE_DOC_VIEW_ARCHITECTURE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_DOC_VIEW_ARCHITECTURE must be defined."
+#   else
+#       define wxUSE_DOC_VIEW_ARCHITECTURE 0
+#   endif
+#endif /* !defined(wxUSE_DOC_VIEW_ARCHITECTURE) */
+
 #ifndef wxUSE_FILEDLG
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_FILEDLG must be defined."
@@ -157,6 +203,22 @@
 #   endif
 #endif /* !defined(wxUSE_GRID) */
 
+#ifndef wxUSE_HELP
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_HELP must be defined."
+#   else
+#       define wxUSE_HELP 0
+#   endif
+#endif /* !defined(wxUSE_HELP) */
+
+#ifndef wxUSE_HTML
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_HTML must be defined."
+#   else
+#       define wxUSE_HTML 0
+#   endif
+#endif /* !defined(wxUSE_HTML) */
+
 #ifndef wxUSE_IMAGLIST
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_IMAGLIST must be defined."
@@ -165,6 +227,14 @@
 #   endif
 #endif /* !defined(wxUSE_IMAGLIST) */
 
+#ifndef wxUSE_JOYSTICK
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_JOYSTICK must be defined."
+#   else
+#       define wxUSE_JOYSTICK 0
+#   endif
+#endif /* !defined(wxUSE_JOYSTICK) */
+
 #ifndef wxUSE_LISTBOX
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_LISTBOX must be defined."
@@ -181,13 +251,37 @@
 #   endif
 #endif /* !defined(wxUSE_LISTCTRL) */
 
-#ifndef wxUSE_MSGDLG
+#ifndef wxUSE_LOG
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_MSGDLG must be defined."
+#       error "wxUSE_LOG must be defined."
 #   else
-#       define wxUSE_MSGDLG 0
+#       define wxUSE_LOG 0
 #   endif
-#endif /* !defined(wxUSE_MSGDLG) */
+#endif /* !defined(wxUSE_LOG) */
+
+#ifndef wxUSE_LOGGUI
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_LOGGUI must be defined."
+#   else
+#       define wxUSE_LOGGUI 0
+#   endif
+#endif /* !defined(wxUSE_LOGGUI) */
+
+#ifndef wxUSE_LOGWINDOW
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_LOGWINDOW must be defined."
+#   else
+#       define wxUSE_LOGWINDOW 0
+#   endif
+#endif /* !defined(wxUSE_LOGWINDOW) */
+
+#ifndef wxUSE_LOG_DIALOG
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_LOG_DIALOG must be defined."
+#   else
+#       define wxUSE_LOG_DIALOG 0
+#   endif
+#endif /* !defined(wxUSE_LOG_DIALOG) */
 
 #ifndef wxUSE_MDI_ARCHITECTURE
 #   ifdef wxABORT_ON_CONFIG_ERROR
@@ -213,6 +307,14 @@
 #   endif
 #endif /* !defined(wxUSE_MIMETYPE) */
 
+#ifndef wxUSE_MSGDLG
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_MSGDLG must be defined."
+#   else
+#       define wxUSE_MSGDLG 0
+#   endif
+#endif /* !defined(wxUSE_MSGDLG) */
+
 #ifndef wxUSE_NEW_GRID
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_NEW_GRID must be defined."
@@ -229,6 +331,14 @@
 #   endif
 #endif /* !defined(wxUSE_NOTEBOOK) */
 
+#ifndef wxUSE_PALETTE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_PALETTE must be defined."
+#   else
+#       define wxUSE_PALETTE 0
+#   endif
+#endif /* !defined(wxUSE_PALETTE) */
+
 #ifndef wxUSE_POPUPWIN
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_POPUPWIN must be defined."
@@ -237,6 +347,14 @@
 #   endif
 #endif /* !defined(wxUSE_POPUPWIN) */
 
+#ifndef wxUSE_PRINTING_ARCHITECTURE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_PRINTING_ARCHITECTURE must be defined."
+#   else
+#       define wxUSE_PRINTING_ARCHITECTURE 0
+#   endif
+#endif /* !defined(wxUSE_PRINTING_ARCHITECTURE) */
+
 #ifndef wxUSE_RADIOBOX
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_RADIOBOX must be defined."
@@ -253,6 +371,14 @@
 #   endif
 #endif /* !defined(wxUSE_RADIOBTN) */
 
+#ifndef wxUSE_REGEX
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_REGEX must be defined."
+#   else
+#       define wxUSE_REGEX 0
+#   endif
+#endif /* !defined(wxUSE_REGEX) */
+
 #ifndef wxUSE_SASH
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_SASH must be defined."
@@ -293,6 +419,14 @@
 #   endif
 #endif /* !defined(wxUSE_SPINCTRL) */
 
+#ifndef wxUSE_SPLASH
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_SPLASH must be defined."
+#   else
+#       define wxUSE_SPLASH 0
+#   endif
+#endif /* !defined(wxUSE_SPLASH) */
+
 #ifndef wxUSE_SPLITTER
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_SPLITTER must be defined."
@@ -325,6 +459,14 @@
 #   endif
 #endif /* !defined(wxUSE_STATLINE) */
 
+#ifndef wxUSE_STATTEXT
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_STATTEXT must be defined."
+#   else
+#       define wxUSE_STATTEXT 0
+#   endif
+#endif /* !defined(wxUSE_STATTEXT) */
+
 #ifndef wxUSE_STATUSBAR
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_STATUSBAR must be defined."
@@ -349,6 +491,14 @@
 #   endif
 #endif /* !defined(wxUSE_TAB_DIALOG) */
 
+#ifndef wxUSE_TEXTBUFFER
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_TEXTBUFFER must be defined."
+#   else
+#       define wxUSE_TEXTBUFFER 0
+#   endif
+#endif /* !defined(wxUSE_TEXTBUFFER) */
+
 #ifndef wxUSE_TEXTCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_TEXTCTRL must be defined."
@@ -357,6 +507,22 @@
 #   endif
 #endif /* !defined(wxUSE_TEXTCTRL) */
 
+#ifndef wxUSE_TEXTFILE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_TEXTFILE must be defined."
+#   else
+#       define wxUSE_TEXTFILE 0
+#   endif
+#endif /* !defined(wxUSE_TEXTFILE) */
+
+#ifndef wxUSE_TIPWINDOW
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_TIPWINDOW must be defined."
+#   else
+#       define wxUSE_TIPWINDOW 0
+#   endif
+#endif /* !defined(wxUSE_TIPWINDOW) */
+
 #ifndef wxUSE_TOOLBAR
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_TOOLBAR must be defined."
@@ -381,6 +547,22 @@
 #   endif
 #endif /* !defined(wxUSE_TREECTRL) */
 
+#ifndef wxUSE_WXHTML_HELP
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_WXHTML_HELP must be defined."
+#   else
+#       define wxUSE_WXHTML_HELP 0
+#   endif
+#endif /* !defined(wxUSE_WXHTML_HELP) */
+
+#ifndef wxUSE_UNICODE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_UNICODE must be defined."
+#   else
+#       define wxUSE_UNICODE 0
+#   endif
+#endif /* !defined(wxUSE_UNICODE) */
+
 /*
    check consistency of the settings
  */
@@ -407,6 +589,7 @@
     wxUSE_STATBMP || \
     wxUSE_STATBOX || \
     wxUSE_STATLINE || \
+    wxUSE_STATTEXT || \
     wxUSE_STATUSBAR || \
     wxUSE_TEXTCTRL || \
     wxUSE_TOOLBAR || \
@@ -421,6 +604,165 @@
 #    endif
 #endif /* controls */
 
+/* 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
+#   endif
+
+#   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__
+#   ifndef __WXUNIVERSAL__
+#       if wxUSE_MDI_ARCHITECTURE && !wxUSE_MENUS
+#           ifdef wxABORT_ON_CONFIG_ERROR
+#               error "MDI requires wxUSE_MENUS in wxGTK"
+#           else
+#               undef wxUSE_MENUS
+#               define wxUSE_MENUS 1
+#           endif
+#       endif
+#   endif /* !__WXUNIVERSAL__ */
+
+#   if wxUSE_JOYSTICK
+#       if !wxUSE_THREADS
+#           ifdef wxABORT_ON_CONFIG_ERROR
+#               error "wxJoystick requires threads in wxGTK"
+#           else
+#               undef wxUSE_JOYSTICK
+#               define wxUSE_JOYSTICK 0
+#           endif
+#       endif
+#   endif
+#endif /* wxGTK && !wxUniv */
+
+/* wxMSW-specific dependencies */
+#ifdef __WXMSW__
+#   ifndef wxUSE_UNICODE_MSLU
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_UNICODE_MSLU must be defined."
+#       else
+#           define wxUSE_UNICODE_MSLU 0
+#       endif
+#   endif  /* wxUSE_UNICODE_MSLU */
+#   ifndef wxUSE_MS_HTML_HELP
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_MS_HTML_HELP must be defined."
+#       else
+#           define wxUSE_MS_HTML_HELP 0
+#       endif
+#   endif /* !defined(wxUSE_MS_HTML_HELP) */
+#   ifndef wxUSE_DIALUP_MANAGER
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_DIALUP_MANAGER must be defined."
+#       else
+#           define wxUSE_DIALUP_MANAGER 0
+#       endif
+#   endif /* !defined(wxUSE_DIALUP_MANAGER) */
+
+#   if !(wxUSE_DYNAMIC_LOADER || wxUSE_DYNLIB_CLASS)
+#       if wxUSE_MS_HTML_HELP
+#           ifdef wxABORT_ON_CONFIG_ERROR
+#               error "wxUSE_MS_HTML_HELP requires wxUSE_DYNAMIC_LOADER."
+#           else
+#               define wxUSE_DYNAMIC_LOADER 1
+#           endif
+#       endif
+#       if wxUSE_DIALUP_MANAGER
+#           ifdef wxABORT_ON_CONFIG_ERROR
+#               error "wxUSE_DIALUP_MANAGER requires wxUSE_DYNAMIC_LOADER."
+#           else
+#               define wxUSE_DYNAMIC_LOADER 1
+#           endif
+#       endif
+#   endif  /* wxUSE_DYNAMIC_LOADER */
+#endif /* wxMSW */
+
+/* wxMotif-specific dependencies */
+#if defined(__WXMOTIF__) && wxUSE_NOTEBOOK && !wxUSE_TAB_DIALOG
+#  undef wxUSE_TAB_DIALOG
+#  define wxUSE_TAB_DIALOG 1
+#endif
+#if defined(__WXMOTIF__) && wxUSE_TOGGLEBTN
+#  undef wxUSE_TOGGLEBTN
+#  define wxUSE_TOGGLEBTN 0
+#endif
+
+/* generic controls dependencies */
+#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
+#   if wxUSE_FONTDLG || wxUSE_FILEDLG || wxUSE_CHOICEDLG
+        /* all common controls are needed by these dialogs */
+#       if !defined(wxUSE_CHOICE) || \
+           !defined(wxUSE_TEXTCTRL) || \
+           !defined(wxUSE_BUTTON) || \
+           !defined(wxUSE_CHECKBOX) || \
+           !defined(wxUSE_STATTEXT)
+#           ifdef wxABORT_ON_CONFIG_ERROR
+#               error "These common controls are needed by common dialogs"
+#           else
+#               undef wxUSE_CHOICE
+#               define wxUSE_CHOICE 1
+#               undef wxUSE_TEXTCTRL
+#               define wxUSE_TEXTCTRL 1
+#               undef wxUSE_BUTTON
+#               define wxUSE_BUTTON 1
+#               undef wxUSE_CHECKBOX
+#               define wxUSE_CHECKBOX 1
+#               undef wxUSE_STATTEXT
+#               define wxUSE_STATTEXT 1
+#           endif
+#       endif
+#   endif
+#endif /* !wxMSW || wxUniv */
+
+/* common dependencies */
 #if wxUSE_CALENDARCTRL
 #   if !(wxUSE_SPINBTN && wxUSE_COMBOBOX)
 #       ifdef wxABORT_ON_CONFIG_ERROR
@@ -445,19 +787,45 @@
 #   endif
 #endif /* wxUSE_RADIOBTN */
 
-#if wxUSE_COMBOBOX
-#   if defined(__WXUNIVERSAL__) && !wxUSE_LISTBOX
+#if wxUSE_WXHTML_HELP
+#   if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "Built in help controller can't be compiled"
+#       else
+#           undef wxUSE_HELP
+#           define wxUSE_HELP 1
+#           undef wxUSE_HTML
+#           define wxUSE_HTML 1
+#           undef wxUSE_COMBOBOX
+#           define wxUSE_COMBOBOX 1
+#       endif
+#   endif
+#endif /* wxUSE_WXHTML_HELP */
+
+#if wxUSE_PRINTING_ARCHITECTURE
+#   if !wxUSE_COMBOBOX
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "Print dialog requires wxUSE_COMBOBOX"
+#       else
+#           undef wxUSE_COMBOBOX
+#           define wxUSE_COMBOBOX 1
+#       endif
+#   endif
+#endif /* wxUSE_PRINTING_ARCHITECTURE */
+
+#if wxUSE_DOC_VIEW_ARCHITECTURE
+#   if !wxUSE_MENUS
 #        ifdef wxABORT_ON_CONFIG_ERROR
-#            error "wxComboBox requires wxListBox in wxUniversal"
+#            error "DocView requires wxUSE_MENUS"
 #        else
-#            undef wxUSE_LISTBOX
-#            define wxUSE_LISTBOX 1
+#            undef wxUSE_MENUS
+#            define wxUSE_MENUS 1
 #        endif
 #   endif
-#endif /* wxUSE_COMBOBOX */
+#endif /* wxUSE_DOC_VIEW_ARCHITECTURE */
 
 #if !wxUSE_FILEDLG
-#   if wxUSE_DOC_VIEW_ARCHITECTURE || wxUSE_HTML
+#   if wxUSE_DOC_VIEW_ARCHITECTURE || wxUSE_WXHTML_HELP
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "wxFileDialog must be compiled as well"
 #       else
@@ -467,17 +835,6 @@
 #   endif
 #endif /* wxUSE_FILEDLG */
 
-#if !wxUSE_FONTDLG
-#   if wxUSE_FONTMAP
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxFontDialog must be compiled as well"
-#       else
-#           undef wxUSE_FONTDLG
-#           define wxUSE_FONTDLG 1
-#       endif
-#   endif
-#endif /* !wxUSE_FONTDLG */
-
 #if !wxUSE_IMAGLIST
 #   if wxUSE_TREECTRL || wxUSE_NOTEBOOK || wxUSE_LISTCTRL
 #       ifdef wxABORT_ON_CONFIG_ERROR
@@ -499,17 +856,6 @@
 #   endif
 #endif
 
-#if wxUSE_RADIOBTN
-#   if defined(__WXUNIVERSAL__) && !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_RADIOBOX
 #   if !wxUSE_RADIOBTN || !wxUSE_STATBOX
 #        ifdef wxABORT_ON_CONFIG_ERROR
@@ -534,41 +880,41 @@
 #    endif
 #endif /* wxUSE_STOPWATCH */
 
-#if wxUSE_TEXTCTRL
-#   ifdef __WXUNIVERSAL__
-#       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_LOGWINDOW
+#    if !wxUSE_TEXTCTRL
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_LOGWINDOW requires wxUSE_TEXTCTRL"
+#        else
+#            undef wxUSE_TEXTCTRL
+#            define wxUSE_TEXTCTRL 1
+#        endif
+#    endif
+#endif /* wxUSE_LOGWINDOW */
 
-#       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 /* __WXUNIVERSAL__ */
-#endif /* wxUSE_RADIOBTN */
+#if wxUSE_LOG_DIALOG
+#    if !wxUSE_LISTCTRL
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_LOG_DIALOG requires wxUSE_LISTCTRL"
+#        else
+#            undef wxUSE_LISTCTRL
+#            define wxUSE_LISTCTRL 1
+#        endif
+#    endif
+#endif /* wxUSE_LOG_DIALOG */
 
 /* I wonder if we shouldn't just remove all occurrences of
    wxUSE_DYNAMIC_CLASSES from the sources? */
 #if !defined(wxUSE_DYNAMIC_CLASSES) || !wxUSE_DYNAMIC_CLASSES
-#   if wxABORT_ON_CONFIG_ERROR
+#   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_DYNAMIC_CLASSES must be defined as 1"
 #   else
 #       undef wxUSE_DYNAMIC_CLASSES
-#       define wxUSE_DYNAMIC_CLASSES
+#       define wxUSE_DYNAMIC_CLASSES 1
 #   endif
 #endif /* wxUSE_DYNAMIC_CLASSES */
 
 #if wxUSE_MIMETYPE && !wxUSE_TEXTFILE
-#   if wxABORT_ON_CONFIG_ERROR
+#   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_MIMETYPE requires wxUSE_TEXTFILE"
 #   else
 #       undef wxUSE_TEXTFILE
@@ -576,8 +922,17 @@
 #   endif
 #endif /* wxUSE_MIMETYPE */
 
+#if wxUSE_TEXTFILE && !wxUSE_TEXTBUFFER
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_TEXTFILE requires wxUSE_TEXTBUFFER"
+#   else
+#       undef wxUSE_TEXTBUFFER
+#       define wxUSE_TEXTBUFFER 1
+#   endif
+#endif /* wxUSE_TEXTFILE */
+
 #if wxUSE_TEXTFILE && !wxUSE_FILE
-#   if wxABORT_ON_CONFIG_ERROR
+#   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_TEXTFILE requires wxUSE_FILE"
 #   else
 #       undef wxUSE_FILE
@@ -586,7 +941,7 @@
 #endif /* wxUSE_TEXTFILE */
 
 #if wxUSE_CLIPBOARD && !wxUSE_DATAOBJ
-#   if wxABORT_ON_CONFIG_ERROR
+#   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxClipboard requires wxDataObject"
 #   else
 #       undef wxUSE_DATAOBJ
@@ -594,29 +949,14 @@
 #   endif
 #endif /* wxUSE_CLIPBOARD */
 
-/* wxUniv-specific dependencies */
-#if defined(__WXUNIVERSAL__)
-#   if (wxUSE_COMBOBOX || wxUSE_MENUS) && !wxUSE_POPUPWIN
-#       if wxABORT_ON_CONFIG_ERROR
-#           error "wxUSE_POPUPWIN must be defined to use comboboxes/menus"
-#       else
-#           undef wxUSE_POPUPWIN
-#           define wxUSE_POPUPWIN 1
-#       endif
-#   endif
-#endif /* wxUSE_POPUPWIN */
-
-/* wxGTK-specific dependencies */
-#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
-#   if wxUSE_MDI_ARCHITECTURE && !wxUSE_MENUS
-#       if wxABORT_ON_CONFIG_ERROR
-#           error "MDI requires wxUSE_MENUS in wxGTK"
-#       else
-#           undef wxUSE_MENUS 
-#           define wxUSE_MENUS 1
-#       endif
+#if wxUSE_UNICODE_MSLU && !wxUSE_UNICODE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_UNICODE_MSLU requires wxUSE_UNICODE"
+#   else
+#       undef wxUSE_UNICODE
+#       define wxUSE_UNICODE 1
 #   endif
-#endif /* wxGTK && !wxUniv */
+#endif /* wxUSE_UNICODE_MSLU */
 
 #endif /* wxUSE_GUI */