Removed treelay sample

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 6ce050c80f264104a8e5a3e32872f9a768fd399e..421e34f0fb74270803013f03c530ade9bdaef781 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -6,16 +6,16 @@
  * Created:     09.08.00
  * RCS-ID:      $Id$
  * Copyright:   (c) 2000 Vadim Zeitlin <vadim@wxwindows.org>
  * Created:     09.08.00
  * RCS-ID:      $Id$
  * Copyright:   (c) 2000 Vadim Zeitlin <vadim@wxwindows.org>

- * Licence:     wxWindows license
+ * Licence:     wxWindows licence

  */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
 
 /*
  */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
 
 /*

-   this global setting determintes what should we do if the setting FOO
+   this global setting determines what should we do if the setting FOO

    requires BAR and BAR is not set: we can either silently define BAR
    (default, recommended) or give an error and abort (mainly useful for
    requires BAR and BAR is not set: we can either silently define BAR
    (default, recommended) or give an error and abort (mainly useful for

-   developpers only)
+   developers only)

  */
 #define wxABORT_ON_CONFIG_ERROR
 
  */
 #define wxABORT_ON_CONFIG_ERROR
 


@@ -991,15 +991,23 @@
 #   endif  /* wxUSE_DYNAMIC_LOADER */
 #endif /* wxMSW */
 
 #   endif  /* wxUSE_DYNAMIC_LOADER */
 #endif /* wxMSW */
 

+/* wxMAC-specific dependencies */
+#ifdef __WXMAC__
+#   if wxUSE_UNICODE
+#       if !TARGET_CARBON
+#           ifdef wxABORT_ON_CONFIG_ERROR
+#               error "wxUSE_UNICODE is only supported for Carbon Targets."
+#           else
+#               define wxUSE_UNICODE 0
+#           endif
+#       endif
+#   endif
+#endif /* wxMAC */

 /* wxMotif-specific dependencies */
 #if defined(__WXMOTIF__) && wxUSE_NOTEBOOK && !wxUSE_TAB_DIALOG
 #  undef wxUSE_TAB_DIALOG
 #  define wxUSE_TAB_DIALOG 1
 #endif
 /* 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

 
 /* wxMGL-specific dependencies */
 #ifdef __WXMGL__
 
 /* wxMGL-specific dependencies */
 #ifdef __WXMGL__


@@ -1047,6 +1055,15 @@
 #           define wxUSE_COMBOBOX 1
 #       endif
 #   endif
 #           define wxUSE_COMBOBOX 1
 #       endif
 #   endif

+
+#   if !wxUSE_DATETIME
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxCalendarCtrl requires wxUSE_DATETIME"
+#       else
+#           undef wxUSE_DATETIME
+#           define wxUSE_DATETIME 1
+#       endif
+#   endif

 #endif /* wxUSE_CALENDARCTRL */
 
 #if wxUSE_CHECKLISTBOX
 #endif /* wxUSE_CALENDARCTRL */
 
 #if wxUSE_CHECKLISTBOX


@@ -1061,7 +1078,7 @@
 #endif /* wxUSE_RADIOBTN */
 
 #if wxUSE_WXHTML_HELP
 #endif /* wxUSE_RADIOBTN */
 
 #if wxUSE_WXHTML_HELP

-#   if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX
+#   if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX || !wxUSE_NOTEBOOK

 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "Built in help controller can't be compiled"
 #       else
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "Built in help controller can't be compiled"
 #       else


@@ -1071,6 +1088,8 @@
 #           define wxUSE_HTML 1
 #           undef wxUSE_COMBOBOX
 #           define wxUSE_COMBOBOX 1
 #           define wxUSE_HTML 1
 #           undef wxUSE_COMBOBOX
 #           define wxUSE_COMBOBOX 1

+#           undef wxUSE_NOTEBOOK
+#           define wxUSE_NOTEBOOK 1

 #       endif
 #   endif
 #endif /* wxUSE_WXHTML_HELP */
 #       endif
 #   endif
 #endif /* wxUSE_WXHTML_HELP */