X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad556aa948efb55c7ecf5060fb3e51f64aacc3ad..1dbe87089bfd7d85fcc584f832ce61a94fc16082:/include/wx/msw/setup0.h diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 73add4e890..561b2e4415 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -19,6 +19,10 @@ // define this to 0 when building wxBase library #define wxUSE_GUI 1 +// ---------------------------------------------------------------------------- +// compatibility settings +// ---------------------------------------------------------------------------- + #define WXWIN_COMPATIBILITY 0 // Compatibility with 1.68 API. // Level 0: no backward compatibility, all new features @@ -26,14 +30,77 @@ // the compatibility code is now very minimal so there // is little advantage to setting it to 1. +// in wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap, +// but this is very dangerous because you can mistakenly pass an icon instead +// of a bitmap to a function taking "const wxBitmap&" - which will *not* work +// because an icon is not a valid bitmap +// +// Starting from 2.1.12, you have the choice under this backwards compatible +// behaviour (your code will still compile, but probably won't behave as +// expected!) and not deriving wxIcon class from wxBitmap, but providing a +// conversion ctor wxBitmap(const wxIcon&) instead. +// +// Recommended setting: 0 +#define wxICON_IS_BITMAP 0 + // ---------------------------------------------------------------------------- // General features // ---------------------------------------------------------------------------- +// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes +// which allow the application to store its settings in the persistent +// storage. Setting this to 1 will also enable on-demand creation of the +// global config object in wxApp. +// +// See also wxUSE_CONFIG_NATIVE below. +// +// Recommended setting: 1 #define wxUSE_CONFIG 1 - // Use wxConfig, with CreateConfig in wxApp + +// If wxUSE_CONFIG is 1, you may choose to use either the native config +// classes under Windows (using .INI files under Win16 and the registry under +// Win32) or the portable text file format used by the config classes under +// Unix. +// +// Default is 1 to use native classes. Note that you may still use +// wxFileConfig even if you set this to 1 - just the config object created by +// default for the applications needs will be a wxRegConfig or wxIniConfig and +// not wxFileConfig. +// +// Recommended setting: 1 +#define wxUSE_CONFIG_NATIVE 1 + +// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows +// to connect/disconnect from the network and be notified whenever the dial-up +// network connection is established/terminated. +// +// Default is 1. +// +// Recommended setting: 1 #define wxUSE_DIALUP_MANAGER 1 - // Use wxDialUpManager class + +// ---------------------------------------------------------------------------- +// Optional controls +// ---------------------------------------------------------------------------- + +// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar +// classes at all. Otherwise, use the native toolbar class unless +// wxUSE_TOOLBAR_NATIVE is 0. Additionally, the generic toolbar class which +// supports some features which might not be supported by the native wxToolBar +// class may be compiled in if wxUSE_TOOLBAR_SIMPLE is 1. +// +// Default is 1 for all settings. +// +// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE and 0 for +// wxUSE_TOOLBAR_SIMPLE (the default is 1 mainly for backwards compatibility). +#define wxUSE_TOOLBAR 1 +#define wxUSE_TOOLBAR_NATIVE 1 +#define wxUSE_TOOLBAR_SIMPLE 1 + +// ---------------------------------------------------------------------------- +// Postscript support settings +// ---------------------------------------------------------------------------- + #define wxUSE_POSTSCRIPT 0 // 0 for no PostScript device context #define wxUSE_AFM_FOR_POSTSCRIPT 0 @@ -62,8 +129,6 @@ #define wxUSE_DRAG_AND_DROP 1 // 0 for no drag and drop -#define wxUSE_TOOLBAR 1 - // Define 1 to use toolbar classes #define wxUSE_BUTTONBAR 1 // Define 1 to use buttonbar classes (enhanced toolbar // for MS Windows) @@ -228,16 +293,16 @@ // wxWindow::SetToolTip() method #define wxUSE_SOCKETS 1 // Set to 1 to use socket classes -#define wxUSE_HTML 0 +#define wxUSE_HTML 1 // Set to 1 to use wxHTML sub-library -#define wxUSE_FS_ZIP 0 -#define wxUSE_FS_INET 0 // Set to 1 to enable virtual file systems +#define wxUSE_FS_ZIP 1 +#define wxUSE_FS_INET 1 // Set to 1 to enable virtual file systems -#define wxUSE_BUSYINFO 0 +#define wxUSE_BUSYINFO 1 // wxBusyInfo displays window with message // when app is busy. Works in same way as // wxBusyCursor -#define wxUSE_ZIPSTREAM 0 +#define wxUSE_ZIPSTREAM 1 // input stream for reading from zip archives /* @@ -274,9 +339,6 @@ // text entry dialog and wxGetTextFromUser function #define wxUSE_TEXTDLG 1 -// wxToolBar class -#define wxUSE_TOOLBAR 1 - // wxStatusBar class #define wxUSE_STATUSBAR 1 @@ -302,6 +364,13 @@ // See note above about using FAFA and CTL3D. #endif +// can we use RICHEDIT control? +#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__) +#define wxUSE_RICHEDIT 1 +#else +#define wxUSE_RICHEDIT 0 +#endif + #define wxUSE_COMMON_DIALOGS 1 // On rare occasions (e.g. using DJGPP) may want // to omit common dialogs @@ -332,9 +401,6 @@ #define wxUSE_NATIVE_STATUSBAR 1 // Set to 0 to use cross-platform wxStatusBar -#define wxUSE_DBWIN32 1 - // Use Andrew Tucker's OutputDebugString implementation - // (required on Win95 only). See utils.cpp. /* * Any platform @@ -382,9 +448,6 @@ #undef wxUSE_THREADS #define wxUSE_THREADS 0 -#undef wxUSE_DBWIN32 -#define wxUSE_DBWIN32 0 - #undef wxUSE_OWNER_DRAWN #define wxUSE_OWNER_DRAWN 0 #endif @@ -394,23 +457,18 @@ #undef wxUSE_THREADS #define wxUSE_THREADS 0 -#undef wxUSE_DBWIN32 -#define wxUSE_DBWIN32 0 - #undef wxUSE_ODBC #define wxUSE_ODBC 0 #endif -#if defined(__WXMSW__) && defined(__BORLANDC__) -#undef wxUSE_ODBC -#define wxUSE_ODBC 0 -#endif - // 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 #endif #if defined(__WXMSW__) && defined(__WATCOMC__) @@ -452,13 +510,5 @@ #endif -// Problem with VC++ 5 and dobjcmn.cpp -/* -#if defined(_MSC_VER) && (_MSC_VER > 1020) && (_MSC_VER < 1200) -#undef wxUSE_DRAG_AND_DROP -#define wxUSE_DRAG_AND_DROP 0 -#endif -*/ - #endif // _WX_SETUP_H_