implemented wxTLW::InteractiveMove and mostly finished wxTLW/Univ

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 339deef635ceb429e03717959c5ce2033b1adac4..4d9097ac3b8f3e628f18df9ec307571ccdbd6455 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -205,6 +205,14 @@
 #   endif
 #endif /* !defined(wxUSE_IMAGLIST) */
 
 #   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."
 #ifndef wxUSE_LISTBOX
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_LISTBOX must be defined."


@@ -245,8 +253,6 @@
 #   endif
 #endif /* !defined(wxUSE_LOGWINDOW) */
 
 #   endif
 #endif /* !defined(wxUSE_LOGWINDOW) */
 

-/* For now... */
-#ifndef __WXGTK__

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


@@ -254,7 +260,6 @@
 #       define wxUSE_LOG_DIALOG 0
 #   endif
 #endif /* !defined(wxUSE_LOG_DIALOG) */
 #       define wxUSE_LOG_DIALOG 0
 #   endif
 #endif /* !defined(wxUSE_LOG_DIALOG) */

-#endif

 
 #ifndef wxUSE_MDI_ARCHITECTURE
 #   ifdef wxABORT_ON_CONFIG_ERROR
 
 #ifndef wxUSE_MDI_ARCHITECTURE
 #   ifdef wxABORT_ON_CONFIG_ERROR


@@ -304,6 +309,14 @@
 #   endif
 #endif /* !defined(wxUSE_NOTEBOOK) */
 
 #   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."
 #ifndef wxUSE_POPUPWIN
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_POPUPWIN must be defined."


@@ -336,6 +349,14 @@
 #   endif
 #endif /* !defined(wxUSE_RADIOBTN) */
 
 #   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."
 #ifndef wxUSE_SASH
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_SASH must be defined."


@@ -576,13 +597,26 @@
 #endif /* __WXUNIVERSAL__ */
 
 /* wxGTK-specific dependencies */
 #endif /* __WXUNIVERSAL__ */
 
 /* wxGTK-specific dependencies */

-#if defined(__WXGTK__) && !defined(__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
+#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 */
 #       endif
 #   endif
 #endif /* wxGTK && !wxUniv */


@@ -687,7 +721,7 @@
 #endif /* wxUSE_DOC_VIEW_ARCHITECTURE */
 
 #if !wxUSE_FILEDLG
 #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
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "wxFileDialog must be compiled as well"
 #       else