compilation fix after incorrectly resolved conflict

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index a6e821cc627f2c72c357f66bddd8dcf077c4acc8..0a68bd4e6553ed74f299c9d1924016cd2d682594 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__
@@ -308,11 +307,23 @@ G
 #define wxUSE_TAB_DIALOG 0
 /* compatibility */
 #define wxUSE_TABDIALOG wxUSE_TAB_DIALOG
+
 /*
- * Use this control
+ * Use wxToollBar
  */
 #define wxUSE_TOOLBAR 0
 
+/*
+ * 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__)
 #define wxUSE_OWNER_DRAWN 1 
   #if wxUSE_TOOLBAR
@@ -601,6 +612,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
 
@@ -735,6 +749,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__ */