added demo for bitmaps of different size

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index a6e821cc627f2c72c357f66bddd8dcf077c4acc8..6c9afc72b10ff8ebc7e2d8f9fd7173075be26abc 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -1,4 +1,3 @@
-G
 /* 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 @@ G
 /* 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__
 
+/* Define this if your version of GTK+ is greater than 1.3 */
+#undef __WXGTK13__
+
 /*
  * Define to 1 for Unix[-like] system
  */
@@ -308,12 +311,24 @@ G
 #define wxUSE_TAB_DIALOG 0
 /* compatibility */
 #define wxUSE_TABDIALOG wxUSE_TAB_DIALOG
+
 /*
- * Use this control
+ * Use wxToollBar
  */
 #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
@@ -601,6 +616,9 @@ G
  */
 #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
 
@@ -635,6 +653,9 @@ G
 /* 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
 
@@ -735,6 +756,6 @@ G
 #undef HAVE_WCSTR_H
 
 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
-#undef HAVE_GDK_XIM
+#undef HAVE_XIM
 
 #endif /* __WX_SETUP_H__ */