Warning fixes for OpenWatcom.

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 13b3f70d4aaf7df9fafcd9dfe5216557189a9a8d..5ced93cfefcaeee3838493c358c0dcda3c811d23 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -5,7 +5,7 @@
 * Modified by:
 * Created:     09.08.00
 * RCS-ID:      $Id$
 * Modified by:
 * Created:     09.08.00
 * RCS-ID:      $Id$

-* Copyright:   (c) 2000 Vadim Zeitlin <vadim@wxwindows.org>
+* Copyright:   (c) 2000 Vadim Zeitlin <vadim@wxwidgets.org>

 * Licence:     wxWindows licence
 */
 
 * Licence:     wxWindows licence
 */
 


@@ -291,6 +291,14 @@
 #   endif
 #endif /* !defined(wxUSE_CHOICE) */
 
 #   endif
 #endif /* !defined(wxUSE_CHOICE) */
 

+#ifndef wxUSE_CHOICEBOOK
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_CHOICEBOOK must be defined."
+#   else
+#       define wxUSE_CHOICEBOOK 0
+#   endif
+#endif /* !defined(wxUSE_CHOICEBOOK) */
+

 #ifndef wxUSE_CHOICEDLG
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_CHOICEDLG must be defined."
 #ifndef wxUSE_CHOICEDLG
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_CHOICEDLG must be defined."


@@ -403,6 +411,14 @@
 #   endif
 #endif /* !defined(wxUSE_HTML) */
 
 #   endif
 #endif /* !defined(wxUSE_HTML) */
 

+#ifndef wxUSE_XRC
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_XRC must be defined."
+#   else
+#       define wxUSE_XRC 0
+#   endif
+#endif /* !defined(wxUSE_XRC) */
+

 #ifndef wxUSE_LIBMSPACK
 #   ifndef __UNIX__
         /* set to 0 on platforms that don't have libmspack */
 #ifndef wxUSE_LIBMSPACK
 #   ifndef __UNIX__
         /* set to 0 on platforms that don't have libmspack */


@@ -496,6 +512,14 @@
 #   endif
 #endif /* !defined(wxUSE_LOG_DIALOG) */
 
 #   endif
 #endif /* !defined(wxUSE_LOG_DIALOG) */
 

+#ifndef wxUSE_MDI
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_MDI must be defined."
+#   else
+#       define wxUSE_MDI 0
+#   endif
+#endif /* !defined(wxUSE_MDI) */
+

 #ifndef wxUSE_MDI_ARCHITECTURE
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_MDI_ARCHITECTURE must be defined."
 #ifndef wxUSE_MDI_ARCHITECTURE
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_MDI_ARCHITECTURE must be defined."


@@ -592,6 +616,14 @@
 #   endif
 #endif /* !defined(wxUSE_SLIDER) */
 
 #   endif
 #endif /* !defined(wxUSE_SLIDER) */
 

+#ifndef wxUSE_SOUND
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_SOUND must be defined."
+#   else
+#       define wxUSE_SOUND 0
+#   endif
+#endif /* !defined(wxUSE_SOUND) */
+

 #ifndef wxUSE_SPINBTN
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_SPINBTN must be defined."
 #ifndef wxUSE_SPINBTN
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_SPINBTN must be defined."


@@ -778,17 +810,6 @@
 #   endif
 #endif /* wxUSE_PROTOCOL */
 
 #   endif
 #endif /* wxUSE_PROTOCOL */
 

-#if wxUSE_GZSTREAM
-#   if !wxUSE_ZLIB
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxUSE_GZSTREAM requires wxUSE_ZLIB"
-#       else
-#           undef wxUSE_ZLIB
-#           define wxUSE_ZLIB 1
-#       endif
-#   endif
-#endif /* wxUSE_GZSTREAM */
-

 /* have to test for wxUSE_HTML before wxUSE_FILESYSTEM */
 #if wxUSE_HTML
 #   if !wxUSE_FILESYSTEM
 /* have to test for wxUSE_HTML before wxUSE_FILESYSTEM */
 #if wxUSE_HTML
 #   if !wxUSE_FILESYSTEM


@@ -870,7 +891,9 @@
 #   endif
 #endif /* wxUSE_UNICODE_MSLU */
 
 #   endif
 #endif /* wxUSE_UNICODE_MSLU */
 

-#if wxUSE_ODBC && wxUSE_UNICODE
+/* ODBC and Unicode are now compatible */
+
+#if 0 /* wxUSE_ODBC && wxUSE_UNICODE */

 #   ifdef wxABORT_ON_CONFIG_ERROR
         /* (ODBC classes aren't Unicode-compatible yet) */
 #       error "wxUSE_ODBC can't be used with wxUSE_UNICODE"
 #   ifdef wxABORT_ON_CONFIG_ERROR
         /* (ODBC classes aren't Unicode-compatible yet) */
 #       error "wxUSE_ODBC can't be used with wxUSE_UNICODE"


@@ -939,7 +962,18 @@
 #    endif
 #endif /* controls */
 
 #    endif
 #endif /* controls */
 

-#if wxUSE_NOTEBOOK || wxUSE_LISTBOOK
+#if wxUSE_BMPBUTTON
+#    if !wxUSE_BUTTON
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_BMPBUTTON requires wxUSE_BUTTON"
+#        else
+#            undef wxUSE_BUTTON
+#            define wxUSE_BUTTON 1
+#        endif
+#    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."
 #   if defined(wxUSE_BOOKCTRL) && !wxUSE_BOOKCTRL
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "wxUSE_BOOKCTRL must be set."


@@ -964,6 +998,17 @@
 #   endif
 #endif /* wxUSE_LISTBOOK */
 
 #   endif
 #endif /* wxUSE_LISTBOOK */
 

+#if wxUSE_CHOICEBOOK
+#   if !wxUSE_CHOICE
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxChoicebook requires wxChoice"
+#       else
+#           undef wxUSE_CHOICE
+#           define wxUSE_CHOICE 1
+#       endif
+#   endif
+#endif /* wxUSE_CHOICEBOOK */
+

 /* 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


@@ -1124,13 +1169,13 @@
 #   endif
 #endif /* wxMGL */
 
 #   endif
 #endif /* wxMGL */
 

-// Hopefully we can emulate these dialogs in due course
-#if wxUSE_SMARTPHONE
+/* Hopefully we can emulate these dialogs in due course */
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)

 #   ifdef wxUSE_COLOURDLG
 #       undef wxUSE_COLOURDLG
 #       define wxUSE_COLOURDLG 0
 #   endif
 #   ifdef wxUSE_COLOURDLG
 #       undef wxUSE_COLOURDLG
 #       define wxUSE_COLOURDLG 0
 #   endif

-#endif /* wxUSE_SMARTPHONE */
+#endif /* __SMARTPHONE__ && __WXWINCE__ */

 
 
 /* generic controls dependencies */
 
 
 /* generic controls dependencies */


@@ -1192,7 +1237,38 @@
 #            define wxUSE_LISTBOX 1
 #        endif
 #   endif
 #            define wxUSE_LISTBOX 1
 #        endif
 #   endif

-#endif /* wxUSE_RADIOBTN */
+#endif /* wxUSE_CHECKLISTBOX */
+
+#if wxUSE_CHOICEDLG
+#   if !wxUSE_LISTBOX
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "Choice dialogs requires wxListBox"
+#        else
+#            undef wxUSE_LISTBOX
+#            define wxUSE_LISTBOX 1
+#        endif
+#   endif
+#endif /* wxUSE_CHOICEDLG */
+
+#if wxUSE_HELP
+#   if !wxUSE_BMPBUTTON
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_HELP requires wxUSE_BMPBUTTON"
+#       else
+#           undef wxUSE_BMPBUTTON
+#           define wxUSE_BMPBUTTON 1
+#       endif
+#   endif
+
+#   if !wxUSE_CHOICEDLG
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_HELP requires wxUSE_CHOICEDLG"
+#       else
+#           undef wxUSE_CHOICEDLG
+#           define wxUSE_CHOICEDLG 1
+#       endif
+#   endif
+#endif /* wxUSE_HELP */

 
 #if wxUSE_WXHTML_HELP
 #   if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX || !wxUSE_NOTEBOOK
 
 #if wxUSE_WXHTML_HELP
 #   if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX || !wxUSE_NOTEBOOK


@@ -1211,6 +1287,104 @@
 #   endif
 #endif /* wxUSE_WXHTML_HELP */
 
 #   endif
 #endif /* wxUSE_WXHTML_HELP */
 

+#if !wxUSE_IMAGE
+/*
+   The default wxUSE_IMAGE setting is 1, so if it's set to 0 we assume the
+   user explicitly wants this and disable all other features that require
+   wxUSE_IMAGE.
+ */
+#   if wxUSE_DRAGIMAGE
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_DRAGIMAGE requires wxUSE_IMAGE"
+#        else
+#            undef wxUSE_DRAGIMAGE
+#            define wxUSE_DRAGIMAGE 0
+#        endif
+#   endif
+
+#   if wxUSE_LIBPNG
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_LIBPNG requires wxUSE_IMAGE"
+#        else
+#            undef wxUSE_LIBPNG
+#            define wxUSE_LIBPNG 0
+#        endif
+#   endif
+
+#   if wxUSE_LIBJPEG
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_LIBJPEG requires wxUSE_IMAGE"
+#        else
+#            undef wxUSE_LIBJPEG
+#            define wxUSE_LIBJPEG 0
+#        endif
+#   endif
+
+#   if wxUSE_LIBTIFF
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_LIBTIFF requires wxUSE_IMAGE"
+#        else
+#            undef wxUSE_LIBTIFF
+#            define wxUSE_LIBTIFF 0
+#        endif
+#   endif
+
+#   if wxUSE_GIF
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_GIF requires wxUSE_IMAGE"
+#        else
+#            undef wxUSE_GIF
+#            define wxUSE_GIF 0
+#        endif
+#   endif
+
+#   if wxUSE_PNM
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_PNM requires wxUSE_IMAGE"
+#        else
+#            undef wxUSE_PNM
+#            define wxUSE_PNM 0
+#        endif
+#   endif
+
+#   if wxUSE_PCX
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_PCX requires wxUSE_IMAGE"
+#        else
+#            undef wxUSE_PCX
+#            define wxUSE_PCX 0
+#        endif
+#   endif
+
+#   if wxUSE_IFF
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_IFF requires wxUSE_IMAGE"
+#        else
+#            undef wxUSE_IFF
+#            define wxUSE_IFF 0
+#        endif
+#   endif
+
+#   if wxUSE_TOOLBAR
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_TOOLBAR requires wxUSE_IMAGE"
+#        else
+#            undef wxUSE_TOOLBAR
+#            define wxUSE_TOOLBAR 0
+#        endif
+#   endif
+
+#   if wxUSE_XPM
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_XPM requires wxUSE_IMAGE"
+#        else
+#            undef wxUSE_XPM
+#            define wxUSE_XPM 0
+#        endif
+#   endif
+
+#endif /* !wxUSE_IMAGE */
+

 #if wxUSE_DOC_VIEW_ARCHITECTURE
 #   if !wxUSE_MENUS
 #        ifdef wxABORT_ON_CONFIG_ERROR
 #if wxUSE_DOC_VIEW_ARCHITECTURE
 #   if !wxUSE_MENUS
 #        ifdef wxABORT_ON_CONFIG_ERROR


@@ -1221,6 +1395,15 @@
 #        endif
 #   endif
 
 #        endif
 #   endif
 

+#   if !wxUSE_CHOICEDLG
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "DocView requires wxUSE_CHOICEDLG"
+#        else
+#            undef wxUSE_CHOICEDLG
+#            define wxUSE_CHOICEDLG 1
+#        endif
+#   endif
+

 #   if !wxUSE_STREAMS && !wxUSE_STD_IOSTREAM
 #        ifdef wxABORT_ON_CONFIG_ERROR
 #            error "DocView requires wxUSE_STREAMS or wxUSE_STD_IOSTREAM"
 #   if !wxUSE_STREAMS && !wxUSE_STD_IOSTREAM
 #        ifdef wxABORT_ON_CONFIG_ERROR
 #            error "DocView requires wxUSE_STREAMS or wxUSE_STD_IOSTREAM"


@@ -1243,6 +1426,15 @@
 #endif /* wxUSE_PRINTING_ARCHITECTURE */
 
 #if wxUSE_MDI_ARCHITECTURE
 #endif /* wxUSE_PRINTING_ARCHITECTURE */
 
 #if wxUSE_MDI_ARCHITECTURE

+#   if !wxUSE_MDI
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "MDI requires wxUSE_MDI"
+#        else
+#            undef wxUSE_MDI
+#            define wxUSE_MDI 1
+#        endif
+#   endif
+

 #   if !wxUSE_DOC_VIEW_ARCHITECTURE
 #        ifdef wxABORT_ON_CONFIG_ERROR
 #            error "MDI requires wxUSE_DOC_VIEW_ARCHITECTURE"
 #   if !wxUSE_DOC_VIEW_ARCHITECTURE
 #        ifdef wxABORT_ON_CONFIG_ERROR
 #            error "MDI requires wxUSE_DOC_VIEW_ARCHITECTURE"


@@ -1264,6 +1456,25 @@
 #   endif
 #endif /* wxUSE_FILEDLG */
 
 #   endif
 #endif /* wxUSE_FILEDLG */
 

+#if !wxUSE_BUTTON
+#   if wxUSE_PROGRESSDLG || \
+       wxUSE_FONTDLG || \
+       wxUSE_FILEDLG || \
+       wxUSE_CHOICEDLG || \
+       wxUSE_NUMBERDLG || \
+       wxUSE_TEXTDLG || \
+       wxUSE_DIRDLG || \
+       wxUSE_STARTUP_TIPS || \
+       wxUSE_WIZARDDLG
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "Common and generic dialogs require wxUSE_BUTTON"
+#       else
+#           undef wxUSE_BUTTON
+#           define wxUSE_BUTTON 1
+#       endif
+#   endif
+#endif /* wxUSE_PROGRESSDLG */
+

 #if !wxUSE_TOOLBAR
 #   if wxUSE_TOOLBAR_NATIVE
 #        ifdef wxABORT_ON_CONFIG_ERROR
 #if !wxUSE_TOOLBAR
 #   if wxUSE_TOOLBAR_NATIVE
 #        ifdef wxABORT_ON_CONFIG_ERROR


@@ -1330,12 +1541,14 @@
 #endif /* wxUSE_LOGWINDOW */
 
 #if wxUSE_LOG_DIALOG
 #endif /* wxUSE_LOGWINDOW */
 
 #if wxUSE_LOG_DIALOG

-#    if !wxUSE_LISTCTRL
+#    if !wxUSE_LISTCTRL || !wxUSE_BUTTON

 #        ifdef wxABORT_ON_CONFIG_ERROR
 #        ifdef wxABORT_ON_CONFIG_ERROR

-#            error "wxUSE_LOG_DIALOG requires wxUSE_LISTCTRL"
+#            error "wxUSE_LOG_DIALOG requires wxUSE_LISTCTRL and wxUSE_BUTTON"

 #        else
 #            undef wxUSE_LISTCTRL
 #            define wxUSE_LISTCTRL 1
 #        else
 #            undef wxUSE_LISTCTRL
 #            define wxUSE_LISTCTRL 1

+#            undef wxUSE_BUTTON
+#            define wxUSE_BUTTON 1

 #        endif
 #    endif
 #endif /* wxUSE_LOG_DIALOG */
 #        endif
 #    endif
 #endif /* wxUSE_LOG_DIALOG */


@@ -1369,5 +1582,14 @@
 #   endif
 #endif /* wxUSE_WX_RESOURCES */
 
 #   endif
 #endif /* wxUSE_WX_RESOURCES */
 

+#if wxUSE_XRC && !wxUSE_XML
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_XRC requires wxUSE_XML"
+#   else
+#       undef wxUSE_XRC
+#       define wxUSE_XRC 0
+#   endif
+#endif /* wxUSE_XRC */
+

 #endif /* wxUSE_GUI */
 
 #endif /* wxUSE_GUI */