added wx(U)int64, then added it to wxDataStream so contrib should

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 907a657216595e72b6e2b36189bb250c712e4a2f..09f018e62d7959d7b4bf47eddf55a79d69712b08 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
 
 /* 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 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
 
 /* 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
 
    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__
 
 /* Define this if your version of GTK+ is greater than 1.2 */
 #undef __WXGTK12__
 


@@ -83,15 +74,19 @@
 #undef __SOLARIS__
 #undef __SUNOS__
 #undef __ALPHA__
 #undef __SOLARIS__
 #undef __SUNOS__
 #undef __ALPHA__

+#undef __IA64__

 #undef __OSF__
 #undef __BSD__
 #undef __FREEBSD__
 #undef __OSF__
 #undef __BSD__
 #undef __FREEBSD__

+#undef __DARWIN__

 #undef __NETBSD__
 #undef __VMS__
 #undef __ULTRIX__
 #undef __DATA_GENERAL__
 #undef __EMX__
 #undef __NETBSD__
 #undef __VMS__
 #undef __ULTRIX__
 #undef __DATA_GENERAL__
 #undef __EMX__

-#undef _GNU_SOURCE
+
+/* PowerPC Darwin & Mac OS X */
+#undef __POWERPC__

 
 /* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
 #ifndef __WINDOWS__
 
 /* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
 #ifndef __WINDOWS__


@@ -99,14 +94,17 @@
 #endif
 
 #undef __WIN95__
 #endif
 
 #undef __WIN95__

+#ifndef __WIN32__

 #undef __WIN32__
 #undef __WIN32__

+#endif

 #undef __GNUWIN32__
 #undef STRICT
 #undef WINVER
 
 /* enable native status bar under Win32 */
 #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_NATIVE_STATUSBAR 1

+#define wxUSE_OWNER_DRAWN 1

 #endif
 
 /* enable rich edit under Win32 */
 #endif
 
 /* enable rich edit under Win32 */


@@ -121,6 +119,10 @@
  */
 #undef HAVE_BOOL
 
  */
 #undef HAVE_BOOL
 

+/*
+ * Use regex support
+ */
+#define wxUSE_REGEX 0

 /*
  * Use zlib
  */
 /*
  * Use zlib
  */


@@ -179,6 +181,11 @@
  */
 #define wxUSE_ON_FATAL_EXCEPTION 0
 
  */
 #define wxUSE_ON_FATAL_EXCEPTION 0
 

+/*
+ * Use wxSingleInstanceChecker class
+ */
+#define wxUSE_SNGLINST_CHECKER 0
+

 /*
  * Use constraints mechanism
  */
 /*
  * Use constraints mechanism
  */


@@ -189,11 +196,61 @@
  */
 #define wxUSE_VALIDATORS 0
 
  */
 #define wxUSE_VALIDATORS 0
 

+/*
+ * Use wxControl
+ */
+#define wxUSE_CONTROLS 0
+
+/*
+   Use wxPopupWindow (useful in wxUniv only for now)
+*/
+#define wxUSE_POPUPWIN 0
+

 /*
  * Use accelerators
  */
 #define wxUSE_ACCEL 0
 
 /*
  * Use accelerators
  */
 #define wxUSE_ACCEL 0
 

+/*
+ * Use wxCalendarCtrl
+ */
+#define wxUSE_CALENDARCTRL 0
+
+/*
+ * Use wxFileDialog
+ */
+#define wxUSE_FILEDLG 0
+
+/*
+ * Use wxFindReplaceDialog
+ */
+#define wxUSE_FINDREPLDLG 0
+
+/*
+ * Use wxFontDialog
+ */
+#define wxUSE_FONTDLG 0
+
+/*
+ * Use wxMimeTypesManager and related classes
+ */
+#define wxUSE_MIMETYPE 0
+
+/*
+ * Use wxSystemOptions
+ */
+#define wxUSE_SYSTEM_OPTIONS 0
+
+/*
+ * Use wxMessageDialog (and wxMessageBox)
+ */
+#define wxUSE_MSGDLG 0
+
+/*
+ * Use wxNumberEntryDialog
+ */
+#define wxUSE_NUMBERDLG 0
+

 /*
  * Use wxTextEntryDialog
  */
 /*
  * Use wxTextEntryDialog
  */


@@ -209,16 +266,50 @@
  */
 #define wxUSE_PROGRESSDLG 0
 
  */
 #define wxUSE_PROGRESSDLG 0
 

+/*
+ * Use chooser dialog
+ */
+#define wxUSE_CHOICEDLG 0
+
+/*
+ * Use colour picker dialog
+ */
+#define wxUSE_COLOURDLG 0
+

 /*
  * Use directory chooser dialog
  */
 #define wxUSE_DIRDLG 0
 
 /*
  * Use directory chooser dialog
  */
 #define wxUSE_DIRDLG 0
 

+/*
+ * Use wxDragImage class
+ */
+#define wxUSE_DRAGIMAGE 0
+
+/*
+ * Use property sheet classes
+ */
+#define wxUSE_PROPSHEET 0
+
+/*
+ * Use wxWizard
+ */
+#define wxUSE_WIZARDDLG 0
+
+/*
+ * Use splash screen
+ */
+#define wxUSE_SPLASH 0
+

 /*
  * Joystick support (Linux/GTK only)
  */
 #define wxUSE_JOYSTICK 0
 
 /*
  * Joystick support (Linux/GTK only)
  */
 #define wxUSE_JOYSTICK 0
 

+/*
+ * Use this control
+ */
+#define wxUSE_BUTTON 0

 /*
  * Use this control
  */
 /*
  * Use this control
  */


@@ -268,6 +359,10 @@
  * Use this control
  */
 #define wxUSE_LISTCTRL 0
  * Use this control
  */
 #define wxUSE_LISTCTRL 0

+/*
+ * Use wxMenuBar, wxMenuItem and wxMenu
+ */
+#define wxUSE_MENUS 0

 /*
  * Use this control
  */
 /*
  * Use this control
  */


@@ -316,6 +411,10 @@
  * Use this control
  */
 #define wxUSE_STATLINE 0
  * Use this control
  */
 #define wxUSE_STATLINE 0

+/*
+ * Use this control
+ */
+#define wxUSE_STATTEXT 0

 /*
  * Use this control
  */
 /*
  * Use this control
  */


@@ -331,6 +430,11 @@
 /* compatibility */
 #define wxUSE_TABDIALOG wxUSE_TAB_DIALOG
 
 /* compatibility */
 #define wxUSE_TABDIALOG wxUSE_TAB_DIALOG
 

+/*
+ * Use wxTextCtrl
+ */
+#define wxUSE_TEXTCTRL 0
+

 /*
  * Use wxToollBar
  */
 /*
  * Use wxToollBar
  */


@@ -348,12 +452,16 @@
 #define wxUSE_TOOLBAR_SIMPLE 0
 
 #if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__)
 #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
 
   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
   #endif
 #endif
 

+/*
+ * Use wxTreeLayout class
+ */
+#define wxUSE_TREELAYOUT 0
+

 /*
  * Use this control
  */
 /*
  * Use this control
  */


@@ -369,11 +477,26 @@
  */
 #define wxUSE_GEOMETRY 0
 
  */
 #define wxUSE_GEOMETRY 0
 

+/*
+ * Use wxCmdLineParser class
+ */
+#define wxUSE_CMDLINE_PARSER 0
+/*
+ * Use wxDateTime
+ */
+#define wxUSE_DATETIME 0

 /*
  * Use wxFile class
  */
 #define wxUSE_FILE 0
 /*
  * Use wxFile class
  */
 #define wxUSE_FILE 0

-
+/*
+ * Use wxFFile class
+ */
+#define wxUSE_FFILE 0
+/*
+ * Use wxTextBuffer class
+ */
+#define wxUSE_TEXTBUFFER 0

 /*
  * Use wxTextFile class
  */
 /*
  * Use wxTextFile class
  */


@@ -383,6 +506,22 @@
  * Use log classes and logging functions
  */
 #define wxUSE_LOG 0
  * Use log classes and logging functions
  */
 #define wxUSE_LOG 0

+/*
+ * Use log window
+ */
+#define wxUSE_LOGWINDOW 0
+/*
+ * Use standard GUI logger
+ */
+#define wxUSE_LOGGUI 0
+/*
+ * Use old log dialog instead of new wxLogGui
+ */
+#define wxUSE_LOG_DIALOG 0
+/*
+ * Use wxStopWatch
+ */
+#define wxUSE_STOPWATCH 0

 /*
  * Use time and date classes
  */
 /*
  * Use time and date classes
  */


@@ -395,6 +534,10 @@
  * Use config system
  */
 #define wxUSE_CONFIG 0
  * Use config system
  */
 #define wxUSE_CONFIG 0

+/*
+ * Use font mapping/conversion classes
+ */
+#define wxUSE_FONTMAP 0

 /*
  * Use intl system
  */
 /*
  * Use intl system
  */


@@ -425,6 +568,11 @@
  */
 #define wxUSE_DYNLIB_CLASS 0
 
  */
 #define wxUSE_DYNLIB_CLASS 0
 

+/*
+ * Use wxTimer
+ */
+#define wxUSE_TIMER 0
+

 /*
  * Use font metric files in GetTextExtent for wxPostScriptDC
  * Use consistent PostScript fonts for AFM and printing (!)
 /*
  * Use font metric files in GetTextExtent for wxPostScriptDC
  * Use consistent PostScript fonts for AFM and printing (!)


@@ -478,6 +626,10 @@
  * Use clipboard
  */
 #define wxUSE_CLIPBOARD 0
  * Use clipboard
  */
 #define wxUSE_CLIPBOARD 0

+/*
+ * Use wxDataObject
+ */
+#define wxUSE_DATAOBJ 0

 /*
  * Use tooltips
  */
 /*
  * Use tooltips
  */


@@ -486,6 +638,10 @@
  * Use dnd
  */
 #define wxUSE_DRAG_AND_DROP 0
  * Use dnd
  */
 #define wxUSE_DRAG_AND_DROP 0

+/*
+ * Use OLE (MSW only)
+ */
+#define wxUSE_OLE 0

 /*
  * Use spline
  */
 /*
  * Use spline
  */


@@ -521,9 +677,18 @@
 #define wxUSE_WX_RESOURCES wxUSE_RESOURCES
 
 /*
 #define wxUSE_WX_RESOURCES wxUSE_RESOURCES
 
 /*

- * Use wxWindows help facility (needs wxUSE_IPC 1)
+ * Use wxWindows help facility

  */
 #define wxUSE_HELP 0
  */
 #define wxUSE_HELP 0

+/*
+ * 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
  */
 /*
  * Use iostream.h rather than iostream
  */


@@ -535,7 +700,11 @@
 /*
  * Compatibility with 2.0 API.
  */
 /*
  * Compatibility with 2.0 API.
  */

-#define WXWIN_COMPATIBILITY_2 1
+#define WXWIN_COMPATIBILITY_2 0
+/*
+ * Compatibility with 2.2 API
+ */
+#define WXWIN_COMPATIBILITY_2_2 0

 /*
  * Enables debugging: memory tracing, assert, etc., contains debug level
  */
 /*
  * Enables debugging: memory tracing, assert, etc., contains debug level
  */


@@ -608,6 +777,11 @@
  */
 #define wxUSE_ZIPSTREAM 0
 
  */
 #define wxUSE_ZIPSTREAM 0
 

+/*
+ * wxPalette class
+ */
+#define wxUSE_PALETTE 0
+

 /*
  * wxImage support
  */
 /*
  * wxImage support
  */


@@ -707,6 +881,12 @@
 /* Define if you have shl_load() */
 #undef HAVE_SHL_LOAD
 
 /* 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
 
 /* Define if you have strptime() */
 #undef HAVE_STRPTIME
 


@@ -752,12 +932,24 @@
 /* The number of bytes in a short.  */
 #undef SIZEOF_SHORT
 
 /* The number of bytes in a short.  */
 #undef SIZEOF_SHORT
 

+/* Define if size_t on your machine is the same type as unsigned int. */
+#undef wxSIZE_T_IS_UINT
+
+/* Define if size_t on your machine is the same type as unsigned long. */
+#undef wxSIZE_T_IS_ULONG
+

 /* Define if you have the dlopen function.  */
 #undef HAVE_DLOPEN
 
 /* Define if you have the dlerror function.  */
 #undef HAVE_DLERROR
 
 /* Define if you have the dlopen function.  */
 #undef HAVE_DLOPEN
 
 /* Define if you have the dlerror function.  */
 #undef HAVE_DLERROR
 

+/* Define if you have Posix fnctl() function. */
+#undef HAVE_FCNTL
+
+/* Define if you have BSD flock() function. */
+#undef HAVE_FLOCK
+

 /* Define if you have the gethostname function.  */
 #undef HAVE_GETHOSTNAME
 
 /* Define if you have the gethostname function.  */
 #undef HAVE_GETHOSTNAME
 


@@ -824,6 +1016,9 @@
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 
 /* 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
 
 /* Define if you have the <iconv.h> header file.  */
 #undef HAVE_ICONV_H
 


@@ -833,7 +1028,34 @@
 /* Define if you have the <langinfo.h> header file.  */
 #undef HAVE_LANGINFO_H
 
 /* 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
 
 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM
 

+
+/* --------------------------------------------------------*
+ *  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__ */
 #endif /* __WX_SETUP_H__ */

+