matching changes for makefile.g95

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 4ed1d58ae8d295d038a4d2a4f077c485c45894fa..6fb515424e0f5aa6b493de30814460e6fe14a977 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -143,6 +143,10 @@
 #define wxUSE_ODBC 0
 #define wxODBC_FWD_ONLY_CURSORS 1
 #define wxODBC_BACKWARD_COMPATABILITY 0
+/*
+ * Use freetype
+ */
+#define wxUSE_FREETYPE 0
 /*
  * Use Threads
  */
@@ -268,10 +272,6 @@
  * Use this control
  */
 #define wxUSE_NOTEBOOK 0
-/*
- * Use wxPlot class
- */
-#define wxUSE_PLOT 0
 /*
  * Use this control
  */
@@ -320,6 +320,10 @@
  * Use this control
  */
 #define wxUSE_STATUSBAR 0
+/*
+ * Use this control
+ */
+#define wxUSE_TOGGLEBTN 0
 /*
  * Use Tab dialog class - obsolete, use wxNotebook instead
  */
@@ -344,7 +348,7 @@
 #define wxUSE_TOOLBAR_SIMPLE 0
 
 #if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__)
-#define wxUSE_OWNER_DRAWN 1 
+#define wxUSE_OWNER_DRAWN 1
   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
   #endif
@@ -360,14 +364,21 @@
  */
 #define wxUSE_LONGLONG 0
 
+/*
+ * Use geometry classes
+ */
+#define wxUSE_GEOMETRY 0
+
 /*
  * Use wxFile class
  */
 #define wxUSE_FILE 0
+
 /*
  * Use wxTextFile class
  */
 #define wxUSE_TEXTFILE 0
+
 /*
  * Use log classes and logging functions
  */
@@ -567,6 +578,7 @@
  * Support for metafiles
  */
 #define wxUSE_METAFILE 0
+#define wxUSE_ENH_METAFILE 0
 
 /*
  * wxMiniFrame
@@ -589,7 +601,7 @@
  * A class that shows info window when app is busy
  * (works exactly like wxBusyCursor)
  */
-#define wxUSE_BUSYINFO 0 
+#define wxUSE_BUSYINFO 0
 
 /*
  * Zip stream for accessing files stored inside .zip archives
@@ -610,7 +622,7 @@
  * PNM image format support
  */
 #define wxUSE_PNM 0
- 
+
 /*
  * Disable this if your compiler can't cope
  * with omission of prototype parameters.
@@ -739,6 +751,12 @@
 /* Define if you have the nanosleep function.  */
 #undef HAVE_NANOSLEEP
 
+/* Define if you have the putenv function.  */
+#undef HAVE_PUTENV
+
+/* Define if you have the setenv function.  */
+#undef HAVE_SETENV
+
 /* Define if you have the shl_load function.  */
 #undef HAVE_SHL_LOAD
 
@@ -778,6 +796,9 @@
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H
 
+/* Define if you have the <fcntl.h> header file.  */
+#undef HAVE_FCNTL_H
+
 /* Define if you have the <wchar.h> header file.  */
 #undef HAVE_WCHAR_H