Platform and compiler-specific checking for MSW and Mac now done
in wx/xxx/chkconf.h. Removed some very obsolete settings, and MSW-specific settings from Mac's setup0.h. wxTimer now derives from wxEvtHandler. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
@@ -915,287 +915,9 @@
|
||||
// Set to 1 to compile in wxPalette class
|
||||
#define wxUSE_PALETTE 1
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Mac-only settings
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#define WORDS_BIGENDIAN 1
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Windows-only settings
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// Set this to 1 if you want to use wxWindows and MFC in the same program. This
|
||||
// will override some other settings (see below)
|
||||
//
|
||||
// Default is 0.
|
||||
//
|
||||
// Recommended setting: 0 unless you really have to use MFC
|
||||
#define wxUSE_MFC 0
|
||||
|
||||
// Set this to 1 for generic OLE support: this is required for drag-and-drop,
|
||||
// clipboard, OLE Automation. Only set it to 0 if your compiler is very old and
|
||||
// can't compile/doesn't have the OLE headers.
|
||||
//
|
||||
// Default is 1.
|
||||
//
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_OLE 1
|
||||
|
||||
// Set this to 1 to use Microsoft CTL3D library for "3D-look" under Win16 or NT
|
||||
// 3.x. This setting is ignored under Win9x and NT 4.0+.
|
||||
//
|
||||
// Default is 0 for (most) Win32 (systems), 1 for Win16
|
||||
//
|
||||
// Recommended setting: same as default
|
||||
#if defined(__WIN95__)
|
||||
#define wxUSE_CTL3D 0
|
||||
#else
|
||||
#define wxUSE_CTL3D 1
|
||||
#endif
|
||||
|
||||
// Define as 1 to use Microsoft's ItsyBitsy small title bar library, for
|
||||
// wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native
|
||||
// miniframes support instead.
|
||||
//
|
||||
// Default is 0 for (most) Win32 (systems), 1 for Win16
|
||||
//
|
||||
// Recommended setting: same as default
|
||||
#if defined(__WIN95__)
|
||||
#define wxUSE_ITSY_BITSY 0
|
||||
#else
|
||||
#define wxUSE_ITSY_BITSY 1
|
||||
#endif
|
||||
|
||||
// Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH
|
||||
// which allows to put more than ~32Kb of text in it even under Win9x (NT
|
||||
// doesn't have such limitation).
|
||||
//
|
||||
// Default is 1 for compilers which support it
|
||||
//
|
||||
// Recommended setting: 1, only set it to 0 if your compiler doesn't have
|
||||
// or can't compile <richedit.h>
|
||||
#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
|
||||
#define wxUSE_RICHEDIT 1
|
||||
|
||||
// TODO: This should be ifdef'ed for any compilers that don't support
|
||||
// RichEdit 2.0 but do have RichEdit 1.0...
|
||||
#define wxUSE_RICHEDIT2 1
|
||||
|
||||
#else
|
||||
#define wxUSE_RICHEDIT 0
|
||||
#define wxUSE_RICHEDIT2 0
|
||||
#endif
|
||||
|
||||
// Set this to 1 to enable support for the owner-drawn menu and listboxes. This
|
||||
// is not required on mac by wxUSE_CHECKLISTBOX.
|
||||
//
|
||||
// Default is 1.
|
||||
//
|
||||
// Recommended setting: O as not implemented on mac
|
||||
#define wxUSE_OWNER_DRAWN 0
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// obsolete settings
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// NB: all settings in this section are obsolete and should not be used/changed
|
||||
// at all, they will disappear
|
||||
|
||||
// Set to 1 to use PenWindows
|
||||
#define wxUSE_PENWINDOWS 0
|
||||
|
||||
// Define 1 to use bitmap messages.
|
||||
#define wxUSE_BITMAP_MESSAGE 1
|
||||
|
||||
// If 1, enables provision of run-time type information.
|
||||
// NOW MANDATORY: don't change.
|
||||
#define wxUSE_DYNAMIC_CLASSES 1
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// disable the settings which don't work for some compilers
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#ifndef wxUSE_NORLANDER_HEADERS
|
||||
#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
|
||||
# define wxUSE_NORLANDER_HEADERS 1
|
||||
#else
|
||||
# define wxUSE_NORLANDER_HEADERS 0
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(__GNUWIN32__)
|
||||
// These don't work as expected for mingw32 and cygwin32
|
||||
#undef wxUSE_MEMORY_TRACING
|
||||
#define wxUSE_MEMORY_TRACING 0
|
||||
|
||||
#undef wxUSE_GLOBAL_MEMORY_OPERATORS
|
||||
#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
|
||||
|
||||
#undef wxUSE_DEBUG_NEW_ALWAYS
|
||||
#define wxUSE_DEBUG_NEW_ALWAYS 0
|
||||
|
||||
// Cygwin betas don't have wcslen
|
||||
#if defined(__CYGWIN__) || defined(__CYGWIN32__)
|
||||
# if ! ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
|
||||
# undef wxUSE_WCHAR_T
|
||||
# define wxUSE_WCHAR_T 0
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#endif // __GNUWIN32__
|
||||
|
||||
// MFC duplicates these operators
|
||||
#if wxUSE_MFC
|
||||
#undef wxUSE_GLOBAL_MEMORY_OPERATORS
|
||||
#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
|
||||
|
||||
#undef wxUSE_DEBUG_NEW_ALWAYS
|
||||
#define wxUSE_DEBUG_NEW_ALWAYS 0
|
||||
#endif // wxUSE_MFC
|
||||
|
||||
|
||||
// Only WIN32 supports wxStatusBar95
|
||||
#if !defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR
|
||||
#undef wxUSE_NATIVE_STATUSBAR
|
||||
#define wxUSE_NATIVE_STATUSBAR 0
|
||||
#endif
|
||||
|
||||
/* NOT TRUE ON MAC
|
||||
#if !wxUSE_OWNER_DRAWN
|
||||
#undef wxUSE_CHECKLISTBOX
|
||||
#define wxUSE_CHECKLISTBOX 0
|
||||
#endif
|
||||
*/
|
||||
|
||||
// Salford C++ doesn't like some of the memory operator definitions
|
||||
#ifdef __SALFORDC__
|
||||
#undef wxUSE_MEMORY_TRACING
|
||||
#define wxUSE_MEMORY_TRACING 0
|
||||
|
||||
#undef wxUSE_GLOBAL_MEMORY_OPERATORS
|
||||
#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
|
||||
|
||||
#undef wxUSE_DEBUG_NEW_ALWAYS
|
||||
#define wxUSE_DEBUG_NEW_ALWAYS 0
|
||||
|
||||
#undef wxUSE_THREADS
|
||||
#define wxUSE_THREADS 0
|
||||
|
||||
#undef wxUSE_OWNER_DRAWN
|
||||
#define wxUSE_OWNER_DRAWN 0
|
||||
#endif // __SALFORDC__
|
||||
|
||||
// BC++/Win16 can't cope with the amount of data in resource.cpp
|
||||
#if defined(__WIN16__) && defined(__BORLANDC__)
|
||||
#undef wxUSE_WX_RESOURCES
|
||||
#define wxUSE_WX_RESOURCES 0
|
||||
|
||||
#undef wxUSE_ODBC
|
||||
#define wxUSE_ODBC 0
|
||||
|
||||
#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
|
||||
// BC++ 4.0 can't compile JPEG library
|
||||
#undef wxUSE_LIBJPEG
|
||||
#define wxUSE_LIBJPEG 0
|
||||
#endif
|
||||
|
||||
// wxUSE_DEBUG_NEW_ALWAYS = 1 not compatible with BC++ in DLL mode
|
||||
#if defined(__BORLANDC__) && (defined(WXMAKINGDLL) || defined(WXUSINGDLL))
|
||||
#undef wxUSE_DEBUG_NEW_ALWAYS
|
||||
#define wxUSE_DEBUG_NEW_ALWAYS 0
|
||||
#endif
|
||||
|
||||
#if defined(__WXMSW__) && defined(__WATCOMC__)
|
||||
/*
|
||||
#undef wxUSE_GLCANVAS
|
||||
#define wxUSE_GLCANVAS 0
|
||||
*/
|
||||
|
||||
#undef wxUSE_WCHAR_T
|
||||
#define wxUSE_WCHAR_T 0
|
||||
#endif
|
||||
|
||||
#if defined(__WXMSW__) && !defined(__WIN32__)
|
||||
|
||||
#undef wxUSE_SOCKETS
|
||||
#define wxUSE_SOCKETS 0
|
||||
|
||||
#undef wxUSE_THREADS
|
||||
#define wxUSE_THREADS 0
|
||||
|
||||
#undef wxUSE_TOOLTIPS
|
||||
#define wxUSE_TOOLTIPS 0
|
||||
|
||||
#undef wxUSE_SPINCTRL
|
||||
#define wxUSE_SPINCTRL 0
|
||||
|
||||
#undef wxUSE_SPINBTN
|
||||
#define wxUSE_SPINBTN 0
|
||||
|
||||
#undef wxUSE_LIBPNG
|
||||
#define wxUSE_LIBPNG 0
|
||||
|
||||
#undef wxUSE_LIBJPEG
|
||||
#define wxUSE_LIBJPEG 0
|
||||
|
||||
#undef wxUSE_LIBTIFF
|
||||
#define wxUSE_LIBTIFF 0
|
||||
|
||||
#undef wxUSE_GIF
|
||||
#define wxUSE_GIF 0
|
||||
|
||||
#undef wxUSE_PNM
|
||||
#define wxUSE_PNM 0
|
||||
|
||||
#undef wxUSE_PCX
|
||||
#define wxUSE_PCX 0
|
||||
|
||||
#undef wxUSE_GLCANVAS
|
||||
#define wxUSE_GLCANVAS 0
|
||||
|
||||
#undef wxUSE_MS_HTML_HELP
|
||||
#define wxUSE_MS_HTML_HELP 0
|
||||
|
||||
#undef wxUSE_WCHAR_T
|
||||
#define wxUSE_WCHAR_T 0
|
||||
|
||||
#endif // Win16
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// undef the things which don't make sense for wxBase build
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#if !wxUSE_GUI
|
||||
|
||||
#undef wxUSE_HTML
|
||||
#define wxUSE_HTML 0
|
||||
|
||||
#endif // !wxUSE_GUI
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// check the settings consistency: do it here to abort compilation immediately
|
||||
// and not almost in the very end when the relevant file fails to compile and
|
||||
// you need to modify setup.h and rebuild everything
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#if wxUSE_DATETIME && !wxUSE_LONGLONG
|
||||
#error wxDateTime requires wxLongLong
|
||||
#endif
|
||||
|
||||
#if wxUSE_TEXTFILE && !wxUSE_FILE
|
||||
#error You cannot compile wxTextFile without wxFile
|
||||
#endif
|
||||
|
||||
#if wxUSE_FILESYSTEM && !wxUSE_STREAMS
|
||||
#error You cannot compile virtual file systems without wxUSE_STREAMS
|
||||
#endif
|
||||
|
||||
#if wxUSE_HTML && !wxUSE_FILESYSTEM
|
||||
#error You cannot compile wxHTML without virtual file systems
|
||||
#endif
|
||||
|
||||
// add more tests here...
|
||||
|
||||
#endif
|
||||
// _WX_SETUP_H_
|
||||
|
||||
Reference in New Issue
Block a user