Simplified sizing code. Sub-windows are now sized explicitly in wxGrid::CalcWindowSi...

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index c47f9abb77d27aa37cccc287a236fd26a4216a45..6c9afc72b10ff8ebc7e2d8f9fd7173075be26abc 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -1,18 +1,25 @@
-
 /* 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__
 #define __WX_SETUP_H__
 
 #ifdef __GNUG__
-    #pragma interface
+#pragma interface
 #endif
 
-/* never undefine inline keyword for C++ compilation */
+/* never undefine inline or const keywords for C++ compilation */
 #ifndef __cplusplus
+
 /* Define to empty if the keyword does not work.  */
 #undef const
-#endif
+
+/* Define as __inline if that's what the C compiler calls it.  */
+#undef inline
+
+#endif /* __cplusplus */
+
+/* fill in with the string wxGetOsDescription() will return */
+#undef WXWIN_OS_DESCRIPTION
 
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef gid_t
@@ -23,9 +30,6 @@
 /* Define if you have the vprintf function.  */
 #undef HAVE_VPRINTF
 
-/* Define as __inline if that's what the C compiler calls it.  */
-#undef inline
-
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef mode_t
 
@@ -54,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
  */
@@ -92,6 +100,18 @@
 #undef STRICT
 #undef WINVER
 
+/* enable native status bar under Win32 */
+#ifdef __WIN95__
+#define wxUSE_NATIVE_STATUSBAR 1
+#endif
+
+/* enable rich edit under Win32 */
+#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
+#define wxUSE_RICHEDIT 1
+#else
+#define wxUSE_RICHEDIT 0
+#endif
+
 /*
  * Supports bool type
  */
@@ -109,10 +129,15 @@
  * Use libjpeg
  */
 #define wxUSE_LIBJPEG 0
+/*
+ * Use libtiff
+ */
+#define wxUSE_LIBTIFF 0
 /*
  * Use iODBC
  */
 #define wxUSE_ODBC 0
+#define wxODBC_FWD_ONLY_CURSORS 1
 /*
  * Use Threads
  */
@@ -256,6 +281,10 @@
  * Use this control
  */
 #define wxUSE_SPINBTN 0
+/*
+ * Use this control
+ */
+#define wxUSE_SPINCTRL 0
 /*
  * Use this control
  */
@@ -282,12 +311,24 @@
 #define wxUSE_TAB_DIALOG 0
 /* compatibility */
 #define wxUSE_TABDIALOG wxUSE_TAB_DIALOG
+
 /*
- * Use this control
+ * Use wxToollBar
  */
 #define wxUSE_TOOLBAR 0
 
-#if defined(__WXWINE__) || defined(__GNUWIN32__)
+/*
+ * 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__) || defined(__WXPM__)
 #define wxUSE_OWNER_DRAWN 1 
   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
@@ -397,13 +438,6 @@
  */
 #define wxUSE_WCSRTOMBS 0
 
-/*
- * On some platforms overloading on size_t/int doesn't work, yet we'd like
- * to define both size_t and int version of wxString::operator[] because it
- * should really be size_t, but a lot of old, broken code uses int indices.
- */
-#define wxUSE_SIZE_T_STRING_OPERATOR 0
-
 /*
  * Use the new experimental implementation of wxString::Printf()?
  *
@@ -477,13 +511,6 @@
  * Use Apple Ieee-double converter
  */
 #define wxUSE_APPLE_IEEE 0
-/*
- * Compatibility with 1.66 API.
- * Level 0: no backward compatibility, all new features
- * Level 1: wxDC, OnSize (etc.) compatibility, but
- * some new features such as event tables
- */
-#define WXWIN_COMPATIBILITY 0
 /*
  * Compatibility with 2.0 API.
  */
@@ -589,12 +616,31 @@
  */
 #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
 
+/* gettimeofday() usually takes 2 arguments, but some really old systems might
+ * have only one, in which case define WX_GETTIMEOFDAY_NO_TZ */
+#undef WX_GETTIMEOFDAY_NO_TZ
+
+/* struct tm doesn't always have the tm_gmtoff field, define this if it does */
+#undef WX_GMTOFF_IN_TM
+
 /* Define if you have dlopen() */
 #undef HAVE_DLOPEN
 
+/* Define if you have gettimeofday() */
+#undef HAVE_GETTIMEOFDAY
+
+/* Define if you have ftime() */
+#undef HAVE_FTIME
+
+/* Define if you have localtime() */
+#undef HAVE_LOCALTIME
+
 /* Define if you have nanosleep() */
 #undef HAVE_NANOSLEEP
 
@@ -604,14 +650,20 @@
 /* Define if you have pthread_cancel */
 #undef HAVE_PTHREAD_CANCEL
 
+/* 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
 
 /* Define if you can specify exit functions to a thread */
 #undef HAVE_THREAD_CLEANUP_FUNCTIONS
 
-/* Define if you have shl_load() */
-#undef HAVE_SHL_LOAD
+/* Define if you have timegm() function */
+#undef HAVE_TIMEGM
 
 /* Define if you have vsnprintf() */
 #undef HAVE_VSNPRINTF
@@ -664,6 +716,9 @@
 /* Define if you have strtok_r function. */
 #undef HAVE_STRTOK_R
 
+/* Define if you have thr_setconcurrency function */
+#undef HaVE_THR_SETCONCURRENCY
+
 /* Define if you have the uname function.  */
 #undef HAVE_UNAME
 
@@ -673,9 +728,6 @@
 /* Define if you have the vfork function.  */
 #undef HAVE_VFORK
 
-/* Define if you have the vsnprintf function.  */
-#undef HAVE_VSNPRINTF
-
 /* Define if you have the <X11/XKBlib.h> header file.  */
 #undef HAVE_X11_XKBLIB_H
 
@@ -703,4 +755,7 @@
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 
+/* Define this if you are using gtk and gdk contains support for X11R6 XIM */
+#undef HAVE_XIM
+
 #endif /* __WX_SETUP_H__ */