X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29fd3c0cc135ac56155a590842f808063ec51176..e1218bd636881ea42715c64b5da9c926ce2d74ec:/setup.h.in?ds=sidebyside

diff --git a/setup.h.in b/setup.h.in
index 9cba0db12f..f6e91fec79 100644
--- 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,15 +74,20 @@
 #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__
@@ -104,8 +100,9 @@
 #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 +117,10 @@
  */
 #undef HAVE_BOOL
 
+/*
+ * Use regex support
+ */
+#define wxUSE_REGEX 0
 /*
  * Use zlib
  */
@@ -218,6 +219,11 @@
  */
 #define wxUSE_FILEDLG 0
 
+/*
+ * Use wxFindReplaceDialog
+ */
+#define wxUSE_FINDREPLDLG 0
+
 /*
  * Use wxFontDialog
  */
@@ -440,12 +446,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
  */
@@ -757,6 +767,11 @@
  */
 #define wxUSE_ZIPSTREAM 0
 
+/*
+ * wxPalette class
+ */
+#define wxUSE_PALETTE 0
+
 /*
  * wxImage support
  */
@@ -856,6 +871,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
 
@@ -997,10 +1018,31 @@
 /* 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__ */
+