more xpm fixes

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 932c30459c2ba9bdade4b9cd20c222bf06a1c276..da40f4be734c012049a5a6536e7776b4f196922d 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -58,8 +58,12 @@
 /* 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
  */
@@ -253,6 +257,10 @@
  * Use this control
  */
 #define wxUSE_NOTEBOOK 0
+/*
+ * Use wxPlot class
+ */
+#define wxUSE_PLOT 0
 /*
  * Use this control
  */
@@ -309,16 +317,22 @@
 #define wxUSE_TABDIALOG wxUSE_TAB_DIALOG
 
 /*
- * Use generic wxToolBar instead of the native one?
+ * Use wxToollBar
  */
-#define wxUSE_TOOLBAR_SIMPLE 0
+#define wxUSE_TOOLBAR 0
 
 /*
- * Use this control
+ * 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 0
+#define wxUSE_TOOLBAR_NATIVE 0
 
-#if defined(__WXWINE__) || defined(__GNUWIN32__)
+/*
+ * 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
@@ -606,6 +620,9 @@
  */
 #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
 
@@ -640,6 +657,9 @@
 /* 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