compilation fix for Watcom

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 1a904e54002ada0d079e3a903b2fad8b6066c0e9..a193068a071061d01802396be1cbe918869cc2af 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -21,15 +21,12 @@
 /* fill in with the string wxGetOsDescription() will return */
 #undef WXWIN_OS_DESCRIPTION
 
+/* the installation location prefix from configure */
+#undef wxINSTALL_PREFIX
+
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef gid_t
 
-/* Define if you don't have vprintf but do have _doprnt.  */
-#undef HAVE_DOPRNT
-
-/* Define if you have the vprintf function.  */
-#undef HAVE_VPRINTF
-
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef mode_t
 
@@ -52,12 +49,6 @@
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 
-/* Define if the X Window System is missing or not being used.  */
-#undef X_DISPLAY_MISSING
-
-/* 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__
 
@@ -83,29 +74,37 @@
 #undef __SOLARIS__
 #undef __SUNOS__
 #undef __ALPHA__
+#undef __IA64__
 #undef __OSF__
 #undef __BSD__
 #undef __FREEBSD__
+#undef __DARWIN__
 #undef __NETBSD__
 #undef __VMS__
 #undef __ULTRIX__
 #undef __DATA_GENERAL__
 #undef __EMX__
 
+/* PowerPC Darwin & Mac OS X */
+#undef __POWERPC__
+
 /* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
 #ifndef __WINDOWS__
 #undef __WINDOWS__
 #endif
 
 #undef __WIN95__
+#ifndef __WIN32__
 #undef __WIN32__
+#endif
 #undef __GNUWIN32__
 #undef STRICT
 #undef WINVER
 
 /* enable native status bar under Win32 */
-#ifdef __WIN95__
+#if defined(__WIN95__) && !defined(__WXUNIVERSAL__)
 #define wxUSE_NATIVE_STATUSBAR 1
+#define wxUSE_OWNER_DRAWN 1
 #endif
 
 /* enable rich edit under Win32 */
@@ -120,6 +119,10 @@
  */
 #undef HAVE_BOOL
 
+/*
+ * Use regex support
+ */
+#define wxUSE_REGEX 0
 /*
  * Use zlib
  */
@@ -203,6 +206,11 @@
 */
 #define wxUSE_POPUPWIN 0
 
+/*
+   Use wxTipWindow
+ */
+#define wxUSE_TIPWINDOW 0
+
 /*
  * Use accelerators
  */
@@ -218,6 +226,11 @@
  */
 #define wxUSE_FILEDLG 0
 
+/*
+ * Use wxFindReplaceDialog
+ */
+#define wxUSE_FINDREPLDLG 0
+
 /*
  * Use wxFontDialog
  */
@@ -228,6 +241,11 @@
  */
 #define wxUSE_MIMETYPE 0
 
+/*
+ * Use wxSystemOptions
+ */
+#define wxUSE_SYSTEM_OPTIONS 0
+
 /*
  * Use wxMessageDialog (and wxMessageBox)
  */
@@ -401,7 +419,6 @@
 /*
  * Use this control
  */
-#define wxUSE_STATUSBAR 0
 #define wxUSE_STATTEXT 0
 /*
  * Use this control
@@ -440,12 +457,16 @@
 #define wxUSE_TOOLBAR_SIMPLE 0
 
 #if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__)
-#define wxUSE_OWNER_DRAWN 1
   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
   #endif
 #endif
 
+/*
+ * Use wxTreeLayout class
+ */
+#define wxUSE_TREELAYOUT 0
+
 /*
  * Use this control
  */
@@ -477,6 +498,10 @@
  * Use wxFFile class
  */
 #define wxUSE_FFILE 0
+/*
+ * Use wxTextBuffer class
+ */
+#define wxUSE_TEXTBUFFER 0
 /*
  * Use wxTextFile class
  */
@@ -497,7 +522,7 @@
 /*
  * Use old log dialog instead of new wxLogGui
  */
-#define wxUSE_LOG_DIALOG 1
+#define wxUSE_LOG_DIALOG 0
 /*
  * Use wxStopWatch
  */
@@ -618,6 +643,10 @@
  * Use dnd
  */
 #define wxUSE_DRAG_AND_DROP 0
+/*
+ * Use OLE (MSW only)
+ */
+#define wxUSE_OLE 0
 /*
  * Use spline
  */
@@ -660,6 +689,10 @@
  * Use built-in HTML-based help controller
  */
 #define wxUSE_WXHTML_HELP 0
+/*
+ * Use MS HTML Help controller (win32)
+ */
+#define wxUSE_MS_HTML_HELP 0
 
 /*
  * Use iostream.h rather than iostream
@@ -749,6 +782,11 @@
  */
 #define wxUSE_ZIPSTREAM 0
 
+/*
+ * wxPalette class
+ */
+#define wxUSE_PALETTE 0
+
 /*
  * wxImage support
  */
@@ -848,6 +886,12 @@
 /* Define if you have shl_load() */
 #undef HAVE_SHL_LOAD
 
+/* define if you have statfs function */
+#undef HAVE_STATFS
+
+/* define if you have statvfs function */
+#undef HAVE_STATVFS
+
 /* Define if you have strptime() */
 #undef HAVE_STRPTIME
 
@@ -920,6 +964,12 @@
 /* Define if you have the inet_aton function.  */
 #undef HAVE_INET_ATON
 
+/* Define if you have the mktemp function.  */
+#undef HAVE_MKTEMP
+
+/* Define if you have the mkstemp function.  */
+#undef HAVE_MKSTEMP
+
 /* Define if you have the nanosleep function.  */
 #undef HAVE_NANOSLEEP
 
@@ -977,6 +1027,9 @@
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 
+/* Define if you have the <wctype.h> header file.  */
+#undef HAVE_WCTYPE_H
+
 /* Define if you have the <iconv.h> header file.  */
 #undef HAVE_ICONV_H
 
@@ -986,10 +1039,34 @@
 /* Define if you have the <langinfo.h> header file.  */
 #undef HAVE_LANGINFO_H
 
+/* Define if you have the <w32api.h> header file (mingw,cygwin).  */
+#undef HAVE_W32API_H
+
+/* Define if you have wcsrtombs() function */
+#undef HAVE_WCSRTOMBS
+
 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM
 
-/* now check the settings self consistency */
+
+/* --------------------------------------------------------*
+ *  This stuff is static, it doesn't get modified directly
+ *  by configure.
+*/
+
 #include "wx/chkconf.h"
 
+/*
+   define some constants identifying wxWindows version in more details than
+   just the version number
+ */
+
+/* wxLogChain class available */
+#define wxHAS_LOG_CHAIN
+
+/* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
+#undef wxHAS_WORKING_GTK_DC_BLIT
+
+
 #endif /* __WX_SETUP_H__ */
+