added CreateSeparatedButtonSizer(), changed signature and semantics of CreateButtonSi...

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index b4d0aadddd0c8d87ac2ce7c0f14d9c271788f09b..60df19067f866a19f6ee563685a63844a3040846 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -271,6 +271,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


@@ -292,12 +294,18 @@
 #define wxUSE_AUI       0
 
 
 #define wxUSE_AUI       0
 
 

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

 #define wxUSE_CONTROLS     0
 
 #define wxUSE_POPUPWIN     0
 
 #define wxUSE_TIPWINDOW    0
 
 #define wxUSE_CONTROLS     0
 
 #define wxUSE_POPUPWIN     0
 
 #define wxUSE_TIPWINDOW    0
 

+#define wxUSE_ANIMATIONCTRL 0

 #define wxUSE_BUTTON        0
 #define wxUSE_BMPBUTTON     0
 #define wxUSE_CALENDARCTRL  0
 #define wxUSE_BUTTON        0
 #define wxUSE_BMPBUTTON     0
 #define wxUSE_CALENDARCTRL  0


@@ -356,6 +364,8 @@
 
 #define wxUSE_ODCOMBOBOX 0
 
 
 #define wxUSE_ODCOMBOBOX 0
 

+#define wxUSE_BITMAPCOMBOBOX 0
+

 
 #define wxUSE_ACCEL 0
 
 
 #define wxUSE_ACCEL 0
 


@@ -411,6 +421,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


@@ -449,6 +461,7 @@
 
 #define wxUSE_HELP        0
 
 
 #define wxUSE_HELP        0
 

+

 #define wxUSE_MS_HTML_HELP 0
 
 
 #define wxUSE_MS_HTML_HELP 0
 
 


@@ -506,6 +519,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


@@ -567,6 +589,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
  */


@@ -690,9 +717,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


@@ -1054,7 +1083,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 */


@@ -1099,6 +1135,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__ */
 
 /* --------------------------------------------------------*


@@ -1117,6 +1160,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__ */