Gobs of changes needed to get up to date with today's CVS

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 26f3fcfe5a50b380220708d7f8651f865b1ff0f8..3fd5256d51d9d7ca651af2d534b3f2444aa859ea 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.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__
 
 /* Define this if you want to use GPE features */
 #undef __WXGPE__
 


@@ -202,6 +205,8 @@
 
 #define wxUSE_STD_STRING  0
 
 
 #define wxUSE_STD_STRING  0
 

+#define wxUSE_PRINTF_POS_PARAMS      0
+

 
 #define wxUSE_LONGLONG      0
 
 
 #define wxUSE_LONGLONG      0
 


@@ -240,12 +245,16 @@
 
 #define wxUSE_FS_ZIP        0
 
 
 #define wxUSE_FS_ZIP        0
 

+#define wxUSE_FS_ARCHIVE    0
+

 #define wxUSE_FS_INET       0
 
 #define wxUSE_ARCHIVE_STREAMS     0
 
 #define wxUSE_ZIPSTREAM     0
 
 #define wxUSE_FS_INET       0
 
 #define wxUSE_ARCHIVE_STREAMS     0
 
 #define wxUSE_ZIPSTREAM     0
 

+#define wxUSE_TARSTREAM     0
+

 #define wxUSE_ZLIB          0
 
 #define wxUSE_APPLE_IEEE          0
 #define wxUSE_ZLIB          0
 
 #define wxUSE_APPLE_IEEE          0


@@ -266,6 +275,8 @@
 
 #define wxUSE_URL_NATIVE 0
 
 
 #define wxUSE_URL_NATIVE 0
 

+#define wxUSE_VARIANT 0
+

 #define wxUSE_REGEX       0
 
 #define wxUSE_SYSTEM_OPTIONS 0
 #define wxUSE_REGEX       0
 
 #define wxUSE_SYSTEM_OPTIONS 0


@@ -284,6 +295,13 @@
 #  define wxUSE_XML       0
 #endif
 
 #  define wxUSE_XML       0
 #endif
 

+#define wxUSE_AUI       0
+
+
+#ifndef wxUSE_GRAPHICS_CONTEXT
+#define wxUSE_GRAPHICS_CONTEXT 0
+#endif
+

 
 #define wxUSE_CONTROLS     0
 
 
 #define wxUSE_CONTROLS     0
 


@@ -291,31 +309,38 @@
 
 #define wxUSE_TIPWINDOW    0
 
 
 #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_DATAVIEWCTRL 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_ANIMATIONCTRL 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_COLLPANE      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
 
 
 #define wxUSE_STATUSBAR    0
 


@@ -344,6 +369,8 @@
 
 #define wxUSE_ODCOMBOBOX 0
 
 
 #define wxUSE_ODCOMBOBOX 0
 

+#define wxUSE_BITMAPCOMBOBOX 0
+

 
 #define wxUSE_ACCEL 0
 
 
 #define wxUSE_ACCEL 0
 


@@ -399,6 +426,8 @@
 
 #define wxUSE_WIZARDDLG 0
 
 
 #define wxUSE_WIZARDDLG 0
 

+#define wxUSE_ABOUTDLG 0
+

 
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0
 
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0


@@ -437,6 +466,7 @@
 
 #define wxUSE_HELP        0
 
 
 #define wxUSE_HELP        0
 

+

 #define wxUSE_MS_HTML_HELP 0
 
 
 #define wxUSE_MS_HTML_HELP 0
 
 


@@ -480,6 +510,8 @@
 
 #define wxUSE_LIBTIFF       0
 
 
 #define wxUSE_LIBTIFF       0
 

+#define wxUSE_TGA           0
+

 #define wxUSE_GIF           0
 
 #define wxUSE_PNM           0
 #define wxUSE_GIF           0
 
 #define wxUSE_PNM           0


@@ -494,6 +526,15 @@
 
 #define wxUSE_PALETTE       0
 
 
 #define wxUSE_PALETTE       0
 

+
+#define wxUSE_ALL_THEMES    0
+
+#define wxUSE_THEME_GTK     0
+#define wxUSE_THEME_METAL   0
+#define wxUSE_THEME_MONO    0
+#define wxUSE_THEME_WIN32   0
+
+

 /* --- end common options --- */
 
 /* for some features we don't have dedicated configure switches, so just choose
 /* --- end common options --- */
 
 /* for some features we don't have dedicated configure switches, so just choose


@@ -555,6 +596,11 @@
  */
 #undef VA_LIST_IS_ARRAY
 
  */
 #undef VA_LIST_IS_ARRAY
 

+/*
+ * Define if the compiler supports variadic macros
+ */
+#undef HAVE_VARIADIC_MACROS
+

 /*
  * Define if your compiler has std::wstring
  */
 /*
  * Define if your compiler has std::wstring
  */


@@ -678,9 +724,11 @@
  */
 #define wxUSE_X_RESOURCES 0
 /*
  */
 #define wxUSE_X_RESOURCES 0
 /*

- * Use OLE (MSW only)
+ * Use OLE and OLE Automation (MSW only)

  */
 #define wxUSE_OLE 0
  */
 #define wxUSE_OLE 0

+#define wxUSE_OLE_AUTOMATION 0
+#define wxUSE_ACTIVEX 0

 
 /* for compatibility */
 #define wxUSE_WX_RESOURCES wxUSE_RESOURCES
 
 /* for compatibility */
 #define wxUSE_WX_RESOURCES wxUSE_RESOURCES


@@ -711,6 +759,12 @@
  */
 #define CONST_COMPATIBILITY 0
 
  */
 #define CONST_COMPATIBILITY 0
 

+/*
+ * use the session manager to detect KDE/GNOME
+ */
+#define wxUSE_DETECT_SM     0
+
+

 /* define with the name of timezone variable */
 #undef WX_TIMEZONE
 
 /* define with the name of timezone variable */
 #undef WX_TIMEZONE
 


@@ -800,6 +854,10 @@
  * with 'char*' for the 3rd parameter instead of 'const char*' */
 #undef HAVE_BROKEN_SNPRINTF_DECL
 
  * with 'char*' for the 3rd parameter instead of 'const char*' */
 #undef HAVE_BROKEN_SNPRINTF_DECL
 

+/* Define if you have a snprintf() which supports positional arguments
+   (defined in the unix98 standard) */
+#undef HAVE_UNIX98_PRINTF
+

 /* define if you have statfs function */
 #undef HAVE_STATFS
 
 /* define if you have statfs function */
 #undef HAVE_STATFS
 


@@ -815,6 +873,9 @@
 /* Define if strptime() is declared in headers */
 #undef HAVE_STRPTIME_DECL
 
 /* Define if strptime() is declared in headers */
 #undef HAVE_STRPTIME_DECL
 

+/* Define if you have strtoull() and strtoll() */
+#undef HAVE_STRTOULL
+

 /* Define if you have all functions to set thread priority */
 #undef HAVE_THREAD_PRIORITY_FUNCTIONS
 
 /* Define if you have all functions to set thread priority */
 #undef HAVE_THREAD_PRIORITY_FUNCTIONS
 


@@ -837,6 +898,9 @@
 /* Define if you have wcslen function  */
 #undef HAVE_WCSLEN
 
 /* Define if you have wcslen function  */
 #undef HAVE_WCSLEN
 

+/* Define if you have wcstoull() and wcstoll() */
+#undef HAVE_WCSTOULL
+

 /* define if you have vsscanf function */
 #undef HAVE_VSSCANF
 
 /* define if you have vsscanf function */
 #undef HAVE_VSSCANF
 


@@ -1038,7 +1102,14 @@
 /* Define this if you have wprintf() and related functions */
 #undef HAVE_WPRINTF
 
 /* Define this if you have wprintf() and related functions */
 #undef HAVE_WPRINTF
 

-/* Define this if you have wprintf() and related functions */
+/* Define this if you have swprintf() */
+#undef HAVE_SWPRINTF
+
+/* Define if you have a _broken_ swprintf() declaration in the header,
+ * without a 'size_t max' parameter as second argument */
+#undef HAVE_BROKEN_SWPRINTF_DECL
+
+/* Define this if you have vswprintf() and related functions */

 #undef HAVE_VSWPRINTF
 
 /* Define this if you have _vsnwprintf */
 #undef HAVE_VSWPRINTF
 
 /* Define this if you have _vsnwprintf */


@@ -1065,6 +1136,12 @@
 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT
 
 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT
 

+/* Define if you have the <sys/select.h> header file.  */
+#undef HAVE_SYS_SELECT_H
+
+/* Define if fdopen is available.  */
+#undef HAVE_FDOPEN
+

 /* -------------------------------------------------------------------------
    Win32 adjustments section
    ------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------
    Win32 adjustments section
    ------------------------------------------------------------------------- */


@@ -1080,6 +1157,13 @@
  */
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 
  */
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 

+/* Define if the system headers declare the type boolean (which will conflict
+ * with the jpeg headers unless HAVE_BOOLEAN is defined).  */
+#undef HAVE_BOOLEAN
+
+/* Define if the header pbt.h is missing.  */
+#undef NEED_PBT_H
+

 #endif /* __WIN32__ */
 
 /* --------------------------------------------------------*
 #endif /* __WIN32__ */
 
 /* --------------------------------------------------------*


@@ -1098,6 +1182,5 @@
 /* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
 #undef wxHAS_WORKING_GTK_DC_BLIT
 
 /* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
 #undef wxHAS_WORKING_GTK_DC_BLIT
 

-

 #endif /* __WX_SETUP_H__ */
 
 #endif /* __WX_SETUP_H__ */