Switch to overriding OnAssertFailure instead of OnAssert

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 4ad05a70bf1bac353f7eebf265611c90970ba31c..a87a6ddc1ee1bd6ae1372f5febe27cae235f595c 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -65,6 +65,9 @@
 /* Define this if your version of GTK+ is greater than 2.4 */
 #undef __WXGTK24__
 
+/* Define this if your version of GTK+ is greater than 2.6 */
+#undef __WXGTK26__
+
 /* Define this if you want to use GPE features */
 #undef __WXGPE__
 
@@ -202,6 +205,8 @@
 
 #define wxUSE_STD_STRING  0
 
+#define wxUSE_PRINTF_POS_PARAMS      0
+
 
 #define wxUSE_LONGLONG      0
 
@@ -284,6 +289,7 @@
 #  define wxUSE_XML       0
 #endif
 
+#define wxUSE_AUI       0
 
 #define wxUSE_CONTROLS     0
 
@@ -291,30 +297,36 @@
 
 #define wxUSE_TIPWINDOW    0
 
-#define wxUSE_BUTTON       0
-#define wxUSE_BMPBUTTON    0
-#define wxUSE_CALENDARCTRL 0
-#define wxUSE_CHECKBOX     0
-#define wxUSE_CHECKLISTBOX 0
-#define wxUSE_CHOICE       0
-#define wxUSE_COMBOBOX     0
-#define wxUSE_DATEPICKCTRL 0
-#define wxUSE_GAUGE        0
-#define wxUSE_LISTBOX      0
-#define wxUSE_LISTCTRL     0
-#define wxUSE_RADIOBOX     0
-#define wxUSE_RADIOBTN     0
-#define wxUSE_SCROLLBAR    0
-#define wxUSE_SLIDER       0
-#define wxUSE_SPINBTN      0
-#define wxUSE_SPINCTRL     0
-#define wxUSE_STATBOX      0
-#define wxUSE_STATLINE     0
-#define wxUSE_STATTEXT     0
-#define wxUSE_STATBMP      0
-#define wxUSE_TEXTCTRL     0
-#define wxUSE_TOGGLEBTN    0
-#define wxUSE_TREECTRL     0
+#define wxUSE_BUTTON        0
+#define wxUSE_BMPBUTTON     0
+#define wxUSE_CALENDARCTRL  0
+#define wxUSE_CHECKBOX      0
+#define wxUSE_CHECKLISTBOX  0
+#define wxUSE_CHOICE        0
+#define wxUSE_COLOURPICKERCTRL 0
+#define wxUSE_COMBOBOX      0
+#define wxUSE_DATAVIEWCTRL  0
+#define wxUSE_DATEPICKCTRL  0
+#define wxUSE_DIRPICKERCTRL 0
+#define wxUSE_FILEPICKERCTRL 0
+#define wxUSE_FONTPICKERCTRL 0
+#define wxUSE_GAUGE         0
+#define wxUSE_HYPERLINKCTRL 0
+#define wxUSE_LISTBOX       0
+#define wxUSE_LISTCTRL      0
+#define wxUSE_RADIOBOX      0
+#define wxUSE_RADIOBTN      0
+#define wxUSE_SCROLLBAR     0
+#define wxUSE_SLIDER        0
+#define wxUSE_SPINBTN       0
+#define wxUSE_SPINCTRL      0
+#define wxUSE_STATBOX       0
+#define wxUSE_STATLINE      0
+#define wxUSE_STATTEXT      0
+#define wxUSE_STATBMP       0
+#define wxUSE_TEXTCTRL      0
+#define wxUSE_TOGGLEBTN     0
+#define wxUSE_TREECTRL      0
 
 #define wxUSE_STATUSBAR    0
 
@@ -331,12 +343,18 @@
 
 #define wxUSE_TREEBOOK 0
 
+#define wxUSE_TOOLBOOK 0
+
 #define wxUSE_TAB_DIALOG    0
 
 #define wxUSE_GRID         0
 
 #define wxUSE_MINIFRAME 0
 
+#define wxUSE_COMBOCTRL 0
+
+#define wxUSE_ODCOMBOBOX 0
+
 
 #define wxUSE_ACCEL 0
 
@@ -505,6 +523,8 @@
 #define wxUSE_RICHEDIT2 0
 #endif
 
+#define wxUSE_INKEDIT 0
+
 #define wxUSE_UNICODE_MSLU 0
 
 #define wxUSE_DC_CACHEING 0
@@ -596,6 +616,10 @@
  * Use GNOME print for printing under GTK+ 2.0
  */
 #define wxUSE_LIBGNOMEPRINT 0
+/*
+ * Use GNOME VFS for MIME types
+ */
+#define wxUSE_LIBGNOMEVFS 0
 /*
  * Use the Hildon framework
  */
@@ -1062,8 +1086,9 @@
    with wx/msw/setup.h */
 #define wxUSE_XPM_IN_MSW wxUSE_XPM
 
-// Set to 0 to disable PostScript print/preview architecture code under Windows
-// (just use Windows printing).
+/* Set to 0 to disable PostScript print/preview architecture code under Windows
+  (just use Windows printing).
+ */
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 
 #endif /* __WIN32__ */