only define wxUSE_NATIVE_STATUSBAR for the ports which have it (MSW and Mac)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2005-01-15 21:07:04 +00:00
parent 1a765d9791
commit c67b4daf47
4 changed files with 199 additions and 100 deletions

View File

@ -30,19 +30,19 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// This setting determines the compatibility with 2.2 API: set it to 1 to // This setting determines the compatibility with 2.2 API: set it to 1 to
// enable it. // enable it but please consider updating your code instead.
// //
// Default is 0. // Default is 0
// //
// Recommended setting: 0 (please update your code instead!) // Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_2 0 #define WXWIN_COMPATIBILITY_2_2 0
// This setting determines the compatibility with 2.4 API: set it to 0 to // This setting determines the compatibility with 2.4 API: set it to 0 to
// flag all cases of using deprecated functions. // flag all cases of using deprecated functions.
// //
// Default is 1 but please try building your code with 0 as the default will // Default is 1 but please try building your code with 0 as the default will
// change to 0 in the next version and the deprecated functions will // change to 0 in the next version and the deprecated functions will disappear
// completely disappear in the version after that. // in the version after it completely.
// //
// Recommended setting: 0 (please update your code) // Recommended setting: 0 (please update your code)
#define WXWIN_COMPATIBILITY_2_4 1 #define WXWIN_COMPATIBILITY_2_4 1
@ -71,14 +71,12 @@
// and if __NO_VC_CRTDBG__ is not defined. // and if __NO_VC_CRTDBG__ is not defined.
// If 1, enables wxDebugContext, for writing error messages to file, etc. If // If 1, enables wxDebugContext, for writing error messages to file, etc. If
// __WXDEBUG__ is not defined, will still use normal memory operators. It's // __WXDEBUG__ is not defined, will still use the normal memory operators.
// recommended to set this to 1, since you may well need to output an error log
// in a production version (or non-debugging beta).
// //
// Default is 1. // Default is 0
// //
// Recommended setting: 1 but see comment above // Recommended setting: 0
#define wxUSE_DEBUG_CONTEXT 0 #define wxUSE_DEBUG_CONTEXT 0
// If 1, enables debugging versions of wxObject::new and wxObject::delete *IF* // If 1, enables debugging versions of wxObject::new and wxObject::delete *IF*
// __WXDEBUG__ is also defined. // __WXDEBUG__ is also defined.
@ -86,10 +84,10 @@
// WARNING: this code may not work with all architectures, especially if // WARNING: this code may not work with all architectures, especially if
// alignment is an issue. This switch is currently ignored for mingw / cygwin // alignment is an issue. This switch is currently ignored for mingw / cygwin
// //
// Default is 1 // Default is 0
// //
// Recommended setting: 1 but see comment in the beginning of this section // Recommended setting: 1 if you are not using a memory debugging tool, else 0
#define wxUSE_MEMORY_TRACING 1 #define wxUSE_MEMORY_TRACING 0
// In debug mode, cause new and delete to be redefined globally. // In debug mode, cause new and delete to be redefined globally.
// If this causes problems (e.g. link errors which is a common problem // If this causes problems (e.g. link errors which is a common problem
@ -105,7 +103,7 @@
// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If // In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
// this causes problems (e.g. link errors), set this to 0. You may need to set // this causes problems (e.g. link errors), set this to 0. You may need to set
// this to 0 if using templates (at least for VC++). This switch is currently // this to 0 if using templates (at least for VC++). This switch is currently
// ignored for mingw / cygwin // ignored for mingw / cygwin / CodeWarrior
// //
// Default is 0 // Default is 0
// //
@ -123,7 +121,8 @@
// Default is 1 // Default is 1
// //
// Recommended setting: 1 if your compiler supports it. // Recommended setting: 1 if your compiler supports it.
#ifdef _MSC_VER #if defined(_MSC_VER) || \
(defined(__BORLANDC__) && __BORLANDC__ >= 0x0550)
#define wxUSE_ON_FATAL_EXCEPTION 1 #define wxUSE_ON_FATAL_EXCEPTION 1
#else #else
#define wxUSE_ON_FATAL_EXCEPTION 0 #define wxUSE_ON_FATAL_EXCEPTION 0
@ -137,14 +136,32 @@
// defined as wchar_t, wxString will use Unicode internally. If you set this // defined as wchar_t, wxString will use Unicode internally. If you set this
// to 1, you must use wxT() macro for all literal strings in the program. // to 1, you must use wxT() macro for all literal strings in the program.
// //
// Unicode is currently only fully supported under Windows NT/2000 (Windows 9x // Unicode is currently only fully supported under Windows NT/2000/XP
// doesn't support it and the programs compiled in Unicode mode will not run // (Windows 9x doesn't support it and the programs compiled in Unicode mode
// under 9x). // will not run under 9x -- but see wxUSE_UNICODE_MSLU below).
// //
// Default is 0 // Default is 0
// //
// Recommended setting: 0 (unless you only plan to use Windows NT/2000) // Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP)
#define wxUSE_UNICODE 0 #ifndef wxUSE_UNICODE
#define wxUSE_UNICODE 0
#endif
// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWidgets in Unicode mode
// and be able to run compiled apps under Windows 9x as well as NT/2000/XP.
// This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
// http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note
// that you will have to modify the makefiles to include unicows.lib import
// library as the first library (see installation instructions in install.txt
// to learn how to do it when building the library or samples).
//
// If your compiler doesn't have unicows.lib, you can get a version of it at
// http://libunicows.sourceforge.net
//
// Default is 0
//
// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems)
#define wxUSE_UNICODE_MSLU 0
// Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without // Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without
// compiling the program in Unicode mode. More precisely, it will be possible // compiling the program in Unicode mode. More precisely, it will be possible
@ -173,6 +190,27 @@
// in your own code (1 if you do, 0 if you don't) // in your own code (1 if you do, 0 if you don't)
#define wxUSE_EXCEPTIONS 1 #define wxUSE_EXCEPTIONS 1
// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI
//
// Default is 0
//
// Recommended setting: 0
#define wxUSE_EXTENDED_RTTI 0
#if defined(__BORLANDC__)
#undef wxUSE_EXTENDED_RTTI
#define wxUSE_EXTENDED_RTTI 1
#endif
// Set wxUSE_STL to 1 to derive wxList(Foo) and wxArray(Foo) from
// std::list<Foo*> and std::vector<Foo*>, with a compatibility interface,
// and for wxHashMap to be implemented with templates.
//
// Default is 0
//
// Recommended setting: YMMV
#define wxUSE_STL 0
// Support for message/error logging. This includes wxLogXXX() functions and // Support for message/error logging. This includes wxLogXXX() functions and
// wxLog and derived classes. Don't set this to 0 unless you really know what // wxLog and derived classes. Don't set this to 0 unless you really know what
// you are doing. // you are doing.
@ -182,13 +220,13 @@
// Recommended setting: 1 (always) // Recommended setting: 1 (always)
#define wxUSE_LOG 1 #define wxUSE_LOG 1
// Recommended setting: 1 (always) // Recommended setting: 1
#define wxUSE_LOGWINDOW 1 #define wxUSE_LOGWINDOW 1
// Recommended setting: 1 (always) // Recommended setting: 1
#define wxUSE_LOGGUI 1 #define wxUSE_LOGGUI 1
// Recommended setting: 1 (always) // Recommended setting: 1
#define wxUSE_LOG_DIALOG 1 #define wxUSE_LOG_DIALOG 1
// Support for command line parsing using wxCmdLineParser class. // Support for command line parsing using wxCmdLineParser class.
@ -204,7 +242,7 @@
// library without it if you have no use for it - this will result in a // library without it if you have no use for it - this will result in a
// somewhat smaller and faster operation. // somewhat smaller and faster operation.
// //
// Threads are only supported under Win32. // This is ignored under Win16, threads are only supported under Win32.
// //
// Default is 1 // Default is 1
// //
@ -217,9 +255,6 @@
// Use standard C++ streams if 1. If 0, use wxWin streams implementation. // Use standard C++ streams if 1. If 0, use wxWin streams implementation.
#define wxUSE_STD_IOSTREAM 0 #define wxUSE_STD_IOSTREAM 0
// Use serialization (requires utils/serialize)
#define wxUSE_SERIAL 0
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// non GUI features selection // non GUI features selection
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -247,6 +282,13 @@
#define wxUSE_FILE 1 #define wxUSE_FILE 1
#define wxUSE_FFILE 1 #define wxUSE_FFILE 1
// Use wxFSVolume class providing access to the configured/active mount points
//
// Default is 1
//
// Recommended setting: 1 (but may be safely disabled if you don't use it)
#define wxUSE_FSVOLUME 1
// use wxTextBuffer class: required by wxTextFile // use wxTextBuffer class: required by wxTextFile
#define wxUSE_TEXTBUFFER 1 #define wxUSE_TEXTBUFFER 1
@ -328,10 +370,10 @@
// Default is 1. // Default is 1.
// //
// Recommended setting: 1 // Recommended setting: 1
#define wxUSE_DYNLIB_CLASS 1 #define wxUSE_DYNLIB_CLASS 1
// experimental extension, use with caution. // experimental, don't use for now
#define wxUSE_DYNAMIC_LOADER 0 #define wxUSE_DYNAMIC_LOADER 1
// Set to 1 to use socket classes // Set to 1 to use socket classes
#define wxUSE_SOCKETS 1 #define wxUSE_SOCKETS 1
@ -386,6 +428,16 @@
// Define this to use wxURL class. // Define this to use wxURL class.
#define wxUSE_URL 1 #define wxUSE_URL 1
// Define this to use native platform url and protocol support.
// Currently valid only for MS-Windows.
// Note: if you set this to 1, you can open ftp/http/gopher sites
// and obtain a valid input stream for these sites
// even when you set wxUSE_PROTOCOL_FTP/HTTP to 0.
// Doing so reduces the code size.
//
// This code is experimental and subject to change.
#define wxUSE_URL_NATIVE 0
// Support for regular expression matching via wxRegEx class: enable this to // Support for regular expression matching via wxRegEx class: enable this to
// use POSIX regular expressions in your code. You need to compile regex // use POSIX regular expressions in your code. You need to compile regex
// library from src/regex to use it under Windows. // library from src/regex to use it under Windows.
@ -409,6 +461,20 @@
// Recommended setting: 1 // Recommended setting: 1
#define wxUSE_MEDIACTRL 1 #define wxUSE_MEDIACTRL 1
// Use QuickTime
//
// Default is 0
//
// Recommended setting: 1 if you have the QT SDK installed and you need it, else 0
#define wxUSE_QUICKTIME 0
// Use DirectShow (requires linkage to strmiids.lib)
//
// Default is 0
//
// Recommended setting: 1 if the DirectX 7 SDK is installed (highly recommended), else 0
#define wxUSE_DIRECTSHOW 0
// Use wxWidget's XRC XML-based resource system. Recommended. // Use wxWidget's XRC XML-based resource system. Recommended.
// //
// Default is 1 // Default is 1
@ -441,20 +507,20 @@
#define wxUSE_CONTROLS 1 #define wxUSE_CONTROLS 1
// wxPopupWindow class is a top level transient window. It is currently used // wxPopupWindow class is a top level transient window. It is currently used
// to implement wxTipWindow but doesn't work yet under Mac. // to implement wxTipWindow
// //
// Default is 0 // Default is 1
// //
// Recommended setting: 0 // Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW)
#define wxUSE_POPUPWIN 0 #define wxUSE_POPUPWIN 1
// wxTipWindow allows to implement the custom tooltips, it is used by the // wxTipWindow allows to implement the custom tooltips, it is used by the
// context help classes. Requires wxUSE_POPUPWIN. // context help classes. Requires wxUSE_POPUPWIN.
// //
// Default is 0 // Default is 1
// //
// Recommended setting: 0 // Recommended setting: 1 (may be set to 0)
#define wxUSE_TIPWINDOW 0 #define wxUSE_TIPWINDOW 1
// Each of the settings below corresponds to one wxWidgets control. They are // Each of the settings below corresponds to one wxWidgets control. They are
// all switched on by default but may be disabled if you are sure that your // all switched on by default but may be disabled if you are sure that your
@ -472,6 +538,7 @@
#define wxUSE_CHECKLISTBOX 1 // wxCheckListBox (requires wxUSE_OWNER_DRAWN) #define wxUSE_CHECKLISTBOX 1 // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
#define wxUSE_CHOICE 1 // wxChoice #define wxUSE_CHOICE 1 // wxChoice
#define wxUSE_COMBOBOX 1 // wxComboBox #define wxUSE_COMBOBOX 1 // wxComboBox
#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl
#define wxUSE_GAUGE 1 // wxGauge #define wxUSE_GAUGE 1 // wxGauge
#define wxUSE_LISTBOX 1 // wxListBox #define wxUSE_LISTBOX 1 // wxListBox
#define wxUSE_LISTCTRL 1 // wxListCtrl #define wxUSE_LISTCTRL 1 // wxListCtrl
@ -486,7 +553,7 @@
#define wxUSE_STATTEXT 1 // wxStaticText #define wxUSE_STATTEXT 1 // wxStaticText
#define wxUSE_STATBMP 1 // wxStaticBitmap #define wxUSE_STATBMP 1 // wxStaticBitmap
#define wxUSE_TEXTCTRL 1 // wxTextCtrl #define wxUSE_TEXTCTRL 1 // wxTextCtrl
#define wxUSE_TOGGLEBTN 0 // requires wxButton #define wxUSE_TOGGLEBTN 1 // requires wxButton
#define wxUSE_TREECTRL 1 // wxTreeCtrl #define wxUSE_TREECTRL 1 // wxTreeCtrl
// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
@ -501,10 +568,14 @@
// or the wrapper around native control. For native look and feel the native // or the wrapper around native control. For native look and feel the native
// version should be used. // version should be used.
// //
// Default is 1. // Default is 1 for the platforms where native status bar is supported.
// //
// Recommended setting: 1 (there is no advantage in using the generic one) // Recommended setting: 1 (there is no advantage in using the generic one)
#if defined(__WXMSW__) || defined(__WXMAC__)
#define wxUSE_NATIVE_STATUSBAR 1 #define wxUSE_NATIVE_STATUSBAR 1
#else
#define wxUSE_NATIVE_STATUSBAR 0
#endif
// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar // wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
// classes at all. Otherwise, use the native toolbar class unless // classes at all. Otherwise, use the native toolbar class unless
@ -517,7 +588,7 @@
#define wxUSE_TOOLBAR_NATIVE 1 #define wxUSE_TOOLBAR_NATIVE 1
// wxNotebook is a control with several "tabs" located on one of its sides. It // wxNotebook is a control with several "tabs" located on one of its sides. It
// may be used ot logically organise the data presented to the user instead of // may be used to logically organise the data presented to the user instead of
// putting everything in one huge dialog. It replaces wxTabControl and related // putting everything in one huge dialog. It replaces wxTabControl and related
// classes of wxWin 1.6x. // classes of wxWin 1.6x.
// //
@ -552,13 +623,19 @@
// wxGrid class // wxGrid class
// //
// Default is 1 // Default is 1, set to 0 to cut down compilation time and binaries size if you
// don't use it.
// //
// Recommended setting: 1 // Recommended setting: 1
//
#define wxUSE_GRID 1 #define wxUSE_GRID 1
// wxProperty[Value/Form/List] classes, used by Dialog Editor // wxMiniFrame class: a frame with narrow title bar
#define wxUSE_PROPSHEET 0 //
// Default is 1.
//
// Recommended setting: 1 (it doesn't cost almost anything)
#define wxUSE_MINIFRAME 1
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Miscellaneous GUI stuff // Miscellaneous GUI stuff
@ -567,6 +644,9 @@
// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar) // wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar)
#define wxUSE_ACCEL 1 #define wxUSE_ACCEL 1
// Hotkey support (currently Windows only)
#define wxUSE_HOTKEY 1
// Use wxCaret: a class implementing a "cursor" in a text control (called caret // Use wxCaret: a class implementing a "cursor" in a text control (called caret
// under Windows). // under Windows).
// //
@ -624,10 +704,7 @@
#define wxUSE_TOOLTIPS 1 #define wxUSE_TOOLTIPS 1
// wxValidator class and related methods // wxValidator class and related methods
#define wxUSE_VALIDATORS 1 #define wxUSE_VALIDATORS 1
// wxDC cacheing implementation
#define wxUSE_DC_CACHEING 0
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// common dialogs // common dialogs
@ -765,12 +842,15 @@
// smaller library. // smaller library.
#define wxUSE_HTML 1 #define wxUSE_HTML 1
// wxWebKit is a wrapper for Apple's WebKit framework, use it if you want to embed // Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL
// the Safari browser control // headers and libraries to be able to compile the library with wxUSE_GLCANVAS
// 0 by default because of Jaguar compatibility problems // set to 1. Note that for some compilers (notably Microsoft Visual C++) you
#define wxUSE_WEBKIT 0 // will need to manually add opengl32.lib and glu32.lib to the list of
// libraries linked with your program if you use OpenGL.
// OpenGL canvas //
// Default is 0.
//
// Recommended setting: 1 if you intend to use OpenGL, 0 otherwise
#define wxUSE_GLCANVAS 0 #define wxUSE_GLCANVAS 0
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -801,6 +881,14 @@
// Recommended setting: 1 // Recommended setting: 1
#define wxUSE_DRAG_AND_DROP 1 #define wxUSE_DRAG_AND_DROP 1
// Use wxAccessible for enhanced and customisable accessibility.
// Depends on wxUSE_OLE.
//
// Default is 0.
//
// Recommended setting (at present): 0
#define wxUSE_ACCESSIBILITY 0
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// miscellaneous settings // miscellaneous settings
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -814,15 +902,19 @@
// space) // space)
#define wxUSE_SNGLINST_CHECKER 1 #define wxUSE_SNGLINST_CHECKER 1
#define wxUSE_DRAGIMAGE 1 #define wxUSE_DRAGIMAGE 1
#define wxUSE_IPC 0 #define wxUSE_IPC 1
// 0 for no interprocess comms // 0 for no interprocess comms
#define wxUSE_HELP 1 #define wxUSE_HELP 1
// 0 for no help facility // 0 for no help facility
#define wxUSE_WXHTML_HELP 1 #define wxUSE_MS_HTML_HELP 1
// 0 for no MS HTML Help // 0 for no MS HTML Help
#define wxUSE_RESOURCES 1
// Use wxHTML-based help controller?
#define wxUSE_WXHTML_HELP 1
#define wxUSE_RESOURCES 0
// 0 for no wxGetResource/wxWriteResource // 0 for no wxGetResource/wxWriteResource
#define wxUSE_CONSTRAINTS 1 #define wxUSE_CONSTRAINTS 1
// 0 for no window layout constraint system // 0 for no window layout constraint system
@ -841,7 +933,11 @@
#define wxUSE_POSTSCRIPT 0 #define wxUSE_POSTSCRIPT 0
// Set to 1 to use font metric files in GetTextExtent // Set to 1 to use font metric files in GetTextExtent
#define wxUSE_AFM_FOR_POSTSCRIPT 0 #define wxUSE_AFM_FOR_POSTSCRIPT 1
// Set to 0 to disable PostScript print/preview architecture code under Windows
// (just use Windows printing).
#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// database classes // database classes
@ -857,7 +953,7 @@
// that use the connection) should support forward only scrolling of cursors, // that use the connection) should support forward only scrolling of cursors,
// or both forward and backward support for backward scrolling cursors is // or both forward and backward support for backward scrolling cursors is
// dependent on the data source as well as the ODBC driver being used. // dependent on the data source as well as the ODBC driver being used.
#define wxODBC_FWD_ONLY_CURSORS 1 #define wxODBC_FWD_ONLY_CURSORS 1
// Default is 0. Set to 1 to use the deprecated classes, enum types, function, // Default is 0. Set to 1 to use the deprecated classes, enum types, function,
// member variables. With a setting of 1, full backward compatability with the // member variables. With a setting of 1, full backward compatability with the
@ -879,16 +975,14 @@
#define REMOVE_UNUSED_ARG 1 #define REMOVE_UNUSED_ARG 1
// VC++ 4.2 and above allows <iostream> and <iostream.h> but you can't mix // VC++ 4.2 and above allows <iostream> and <iostream.h> but you can't mix
// them. Set to 1 for <iostream.h>, 0 for <iostream> // them. Set to 1 for <iostream.h>, 0 for <iostream>. Note that VC++ 7.1
// and later doesn't support wxUSE_IOSTREAMH == 1 and so <iostream> will be
// used anyhow.
// //
// Default is 1. // Default is 1.
// //
// Recommended setting: whatever your compiler likes more // Recommended setting: whatever your compiler likes more
#ifndef __MWERKS__
#define wxUSE_IOSTREAMH 0
#else
#define wxUSE_IOSTREAMH 1 #define wxUSE_IOSTREAMH 1
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// image format support // image format support
@ -923,7 +1017,7 @@
// Set to 1 for PCX format support // Set to 1 for PCX format support
#define wxUSE_PCX 1 #define wxUSE_PCX 1
// Set to 1 for IFF format support // Set to 1 for IFF format support (Amiga format)
#define wxUSE_IFF 0 #define wxUSE_IFF 0
// Set to 1 for XPM format support // Set to 1 for XPM format support
@ -935,10 +1029,6 @@
// Set to 1 to compile in wxPalette class // Set to 1 to compile in wxPalette class
#define wxUSE_PALETTE 1 #define wxUSE_PALETTE 1
// If 1, enables provision of run-time type information.
// NOW MANDATORY: don't change.
#define wxUSE_DYNAMIC_CLASSES 1
/* --- end common options --- */ /* --- end common options --- */
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

View File

@ -567,10 +567,14 @@
// or the wrapper around native control. For native look and feel the native // or the wrapper around native control. For native look and feel the native
// version should be used. // version should be used.
// //
// Default is 1. // Default is 1 for the platforms where native status bar is supported.
// //
// Recommended setting: 1 (there is no advantage in using the generic one) // Recommended setting: 1 (there is no advantage in using the generic one)
#if defined(__WXMSW__) || defined(__WXMAC__)
#define wxUSE_NATIVE_STATUSBAR 1 #define wxUSE_NATIVE_STATUSBAR 1
#else
#define wxUSE_NATIVE_STATUSBAR 0
#endif
// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar // wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
// classes at all. Otherwise, use the native toolbar class unless // classes at all. Otherwise, use the native toolbar class unless
@ -618,12 +622,20 @@
// wxGrid class // wxGrid class
// //
// Default is 1 for both options. // Default is 1, set to 0 to cut down compilation time and binaries size if you
// don't use it.
// //
// Recommended setting: 1 // Recommended setting: 1
// //
#define wxUSE_GRID 1 #define wxUSE_GRID 1
// wxMiniFrame class: a frame with narrow title bar
//
// Default is 1.
//
// Recommended setting: 1 (it doesn't cost almost anything)
#define wxUSE_MINIFRAME 1
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Miscellaneous GUI stuff // Miscellaneous GUI stuff
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -693,16 +705,6 @@
// wxValidator class and related methods // wxValidator class and related methods
#define wxUSE_VALIDATORS 1 #define wxUSE_VALIDATORS 1
// wxDC cacheing implementation
#define wxUSE_DC_CACHEING 1
// Set this to 1 to enable the use of DIB's for wxBitmap to support
// bitmaps > 16MB on Win95/98/Me. Set to 0 to use DDB's only.
#define wxUSE_DIB_FOR_BITMAP 0
// Set this to 1 to enable wxDIB
#define wxUSE_WXDIB 1
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// common dialogs // common dialogs
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -911,7 +913,7 @@
// Use wxHTML-based help controller? // Use wxHTML-based help controller?
#define wxUSE_WXHTML_HELP 1 #define wxUSE_WXHTML_HELP 1
#define wxUSE_RESOURCES 1 #define wxUSE_RESOURCES 0
// 0 for no wxGetResource/wxWriteResource // 0 for no wxGetResource/wxWriteResource
#define wxUSE_CONSTRAINTS 1 #define wxUSE_CONSTRAINTS 1
// 0 for no window layout constraint system // 0 for no window layout constraint system

View File

@ -552,10 +552,14 @@
// or the wrapper around native control. For native look and feel the native // or the wrapper around native control. For native look and feel the native
// version should be used. // version should be used.
// //
// Default is 1. // Default is 1 for the platforms where native status bar is supported.
// //
// Recommended setting: 1 (there is no advantage in using the generic one) // Recommended setting: 1 (there is no advantage in using the generic one)
#if defined(__WXMSW__) || defined(__WXMAC__)
#define wxUSE_NATIVE_STATUSBAR 1 #define wxUSE_NATIVE_STATUSBAR 1
#else
#define wxUSE_NATIVE_STATUSBAR 0
#endif
// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar // wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
// classes at all. Otherwise, use the native toolbar class unless // classes at all. Otherwise, use the native toolbar class unless
@ -603,12 +607,20 @@
// wxGrid class // wxGrid class
// //
// Default is 1 for both options. // Default is 1, set to 0 to cut down compilation time and binaries size if you
// don't use it.
// //
// Recommended setting: 1 // Recommended setting: 1
// //
#define wxUSE_GRID 1 #define wxUSE_GRID 1
// wxMiniFrame class: a frame with narrow title bar
//
// Default is 1.
//
// Recommended setting: 1 (it doesn't cost almost anything)
#define wxUSE_MINIFRAME 1
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Miscellaneous GUI stuff // Miscellaneous GUI stuff
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -886,7 +898,7 @@
// Use wxHTML-based help controller? // Use wxHTML-based help controller?
#define wxUSE_WXHTML_HELP 1 #define wxUSE_WXHTML_HELP 1
#define wxUSE_RESOURCES 1 #define wxUSE_RESOURCES 0
// 0 for no wxGetResource/wxWriteResource // 0 for no wxGetResource/wxWriteResource
#define wxUSE_CONSTRAINTS 1 #define wxUSE_CONSTRAINTS 1
// 0 for no window layout constraint system // 0 for no window layout constraint system

View File

@ -319,7 +319,11 @@
#define wxUSE_STATUSBAR 1 #define wxUSE_STATUSBAR 1
#if defined(__WXMSW__) || defined(__WXMAC__)
#define wxUSE_NATIVE_STATUSBAR 1 #define wxUSE_NATIVE_STATUSBAR 1
#else
#define wxUSE_NATIVE_STATUSBAR 0
#endif
#define wxUSE_TOOLBAR 1 #define wxUSE_TOOLBAR 1
#define wxUSE_TOOLBAR_NATIVE 1 #define wxUSE_TOOLBAR_NATIVE 1
@ -334,6 +338,8 @@
#define wxUSE_GRID 1 #define wxUSE_GRID 1
#define wxUSE_MINIFRAME 1
#define wxUSE_ACCEL 1 #define wxUSE_ACCEL 1
@ -486,17 +492,12 @@
/* --- end common options --- */ /* --- end common options --- */
/* enable native status bar under Win32 */ /* for some features we don't have dedicated configure switches, so just choose
#if defined(__WIN95__) && !defined(__WXUNIVERSAL__) * the common values automatically */
#define wxUSE_NATIVE_STATUSBAR 1 #if (defined(__WIN95__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
#define wxUSE_OWNER_DRAWN 1 #define wxUSE_OWNER_DRAWN 1
#endif #endif
#if defined(__WXPM__)
#define wxUSE_OWNER_DRAWN 1
#endif
/* enable rich edit under Win32 */
#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__) #if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
#define wxUSE_RICHEDIT 1 #define wxUSE_RICHEDIT 1
#else #else
@ -569,10 +570,6 @@
* case WX_NO_REGEX_ADVANCED should be defined. * case WX_NO_REGEX_ADVANCED should be defined.
*/ */
#undef WX_NO_REGEX_ADVANCED #undef WX_NO_REGEX_ADVANCED
/*
* Use XML support
*/
#define wxUSE_XML 0
/* /*
* Use SDL for audio (Unix) * Use SDL for audio (Unix)
*/ */
@ -598,10 +595,8 @@
*/ */
#define wxHAVE_LIB_XPM 0 #define wxHAVE_LIB_XPM 0
/* /*
* Use font metric files in GetTextExtent for wxPostScriptDC
* Use consistent PostScript fonts for AFM and printing (!) * Use consistent PostScript fonts for AFM and printing (!)
*/ */
#define wxUSE_AFM_FOR_POSTSCRIPT 0
#define wxUSE_NORMALIZED_PS_FONTS 0 #define wxUSE_NORMALIZED_PS_FONTS 0
/* compatibility */ /* compatibility */