patched DoSetClippingRegionAsRegion to update clipping state vars

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index d9db44da8d05bf806fa78e8205a4b3455db39d69..6c9afc72b10ff8ebc7e2d8f9fd7173075be26abc 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -1,4 +1,3 @@
-

 /* This define (__WX_SETUP_H__) is used both to insure setup.h is included
  * only once and to indicate that we are building using configure. */
 #ifndef __WX_SETUP_H__
 /* This define (__WX_SETUP_H__) is used both to insure setup.h is included
  * only once and to indicate that we are building using configure. */
 #ifndef __WX_SETUP_H__


@@ -59,8 +58,12 @@
 /* Define if lex declares yytext as a char * by default, not a char[].  */
 #undef YYTEXT_POINTER
 
 /* Define if lex declares yytext as a char * by default, not a char[].  */
 #undef YYTEXT_POINTER
 

+/* Define this if your version of GTK+ is greater than 1.2 */

 #undef __WXGTK12__
 
 #undef __WXGTK12__
 

+/* Define this if your version of GTK+ is greater than 1.3 */
+#undef __WXGTK13__
+

 /*
  * Define to 1 for Unix[-like] system
  */
 /*
  * Define to 1 for Unix[-like] system
  */


@@ -278,6 +281,10 @@
  * Use this control
  */
 #define wxUSE_SPINBTN 0
  * Use this control
  */
 #define wxUSE_SPINBTN 0

+/*
+ * Use this control
+ */
+#define wxUSE_SPINCTRL 0

 /*
  * Use this control
  */
 /*
  * Use this control
  */


@@ -304,12 +311,24 @@
 #define wxUSE_TAB_DIALOG 0
 /* compatibility */
 #define wxUSE_TABDIALOG wxUSE_TAB_DIALOG
 #define wxUSE_TAB_DIALOG 0
 /* compatibility */
 #define wxUSE_TABDIALOG wxUSE_TAB_DIALOG

+

 /*
 /*

- * Use this control
+ * Use wxToollBar

  */
 #define wxUSE_TOOLBAR 0
 
  */
 #define wxUSE_TOOLBAR 0
 

-#if defined(__WXWINE__) || defined(__GNUWIN32__)
+/*
+ * If 1, use the native toolbar, otherwise use the generic version
+ * (wxToolBarSimple) which may also be use together with the native one.
+ */
+#define wxUSE_TOOLBAR_NATIVE 0
+
+/*
+ * Use generic wxToolBar instead of/together with the native one?
+ */
+#define wxUSE_TOOLBAR_SIMPLE 0
+
+#if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__)

 #define wxUSE_OWNER_DRAWN 1 
   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
 #define wxUSE_OWNER_DRAWN 1 
   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1


@@ -597,6 +616,9 @@
  */
 #define CONST_COMPATIBILITY 0
 
  */
 #define CONST_COMPATIBILITY 0
 

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

 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #undef SOCKLEN_T
 
 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #undef SOCKLEN_T
 


@@ -631,6 +653,9 @@
 /* Define if you have shl_load() */
 #undef HAVE_SHL_LOAD
 
 /* Define if you have shl_load() */
 #undef HAVE_SHL_LOAD
 

+/* Define if you have strptime() */
+#undef HAVE_STRPTIME
+

 /* 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
 


@@ -691,6 +716,9 @@
 /* Define if you have strtok_r function. */
 #undef HAVE_STRTOK_R
 
 /* Define if you have strtok_r function. */
 #undef HAVE_STRTOK_R
 

+/* Define if you have thr_setconcurrency function */
+#undef HaVE_THR_SETCONCURRENCY
+

 /* Define if you have the uname function.  */
 #undef HAVE_UNAME
 
 /* Define if you have the uname function.  */
 #undef HAVE_UNAME
 


@@ -727,4 +755,7 @@
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 

+/* Define this if you are using gtk and gdk contains support for X11R6 XIM */
+#undef HAVE_XIM
+

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