X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..f888d61444c1549c5e8a593055f0159dd07eca86:/include/wx/univ/setup0.h diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index ed4f25881e..5d5d864f70 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -6,7 +6,7 @@ // Created: 14.08.00 // RCS-ID: $Id$ // Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com) -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _WX_UNIV_SETUP_H_ @@ -47,23 +47,20 @@ // This setting determines the compatibility with 2.0 API: set it to 1 to // enable it // -// Default is 1. +// Default is 0. // // Recommended setting: 0 (please update your code instead!) #define WXWIN_COMPATIBILITY_2_2 0 -// 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 +// This setting determines the compatibility with 2.2 API: set it to 0 to +// flag all cases of using deprecated functions. // -// 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. +// 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 disappear +// in the version after it completely. // -// Recommended setting: 0 -#define wxICON_IS_BITMAP 0 +// Recommended setting: 0 (please update your code) +#define WXWIN_COMPATIBILITY_2_4 1 // Define as 1 for font size to be backward compatible to 1.63 and earlier. // 1.64 and later define point sizes to be compatible with Windows. @@ -199,7 +196,7 @@ // // Recommended setting: 1 for win32 else 0 #if defined(__WIN32__) - #define wxUSE_WCHAR_T 0 //? unresolved external symbol wxCharsetToCodepage + #define wxUSE_WCHAR_T 1 #else #define wxUSE_WCHAR_T 0 #endif @@ -217,13 +214,6 @@ // Recommended setting: 1 (always) #define wxUSE_LOG 1 -// Support for command line parsing using wxCmdLineParser class. -// -// Default is 1 -// -// Recommended setting: 1 (can be set to 0 if you don't use the cmd line) -#define wxUSE_CMDLINE_PARSER 1 - // Recommended setting: 1 #define wxUSE_LOGWINDOW 1 @@ -233,6 +223,13 @@ // Recommended setting: 1 #define wxUSE_LOG_DIALOG 1 +// Support for command line parsing using wxCmdLineParser class. +// +// Default is 1 +// +// Recommended setting: 1 (can be set to 0 if you don't use the cmd line) +#define wxUSE_CMDLINE_PARSER 1 + // Support for multithreaded applications: if 1, compile in thread classes // (thread.h) and make the library a bit more thread safe. Although thread // support is quite stable by now, you may still consider recompiling the @@ -450,14 +447,14 @@ // Recommended setting: 1 #define wxUSE_PROTOCOL 1 -// Define this to use wxURL class. -#define wxUSE_URL 1 - // The settings for the individual URL schemes #define wxUSE_PROTOCOL_FILE 1 #define wxUSE_PROTOCOL_FTP 1 #define wxUSE_PROTOCOL_HTTP 1 +// Define this to use wxURL class. +#define wxUSE_URL 1 + // Support for regular expression matching via wxRegEx class: enable this to // use POSIX regular expressions in your code. You need to compile regex // library from src/regex to use it under Windows. @@ -472,11 +469,7 @@ #define wxUSE_SYSTEM_OPTIONS 1 // wxWave class -#if defined(__WIN32__) - #define wxUSE_WAVE 1 -#else - #define wxUSE_WAVE 1 -#endif +#define wxUSE_WAVE 1 // ---------------------------------------------------------------------------- // Individual GUI controls @@ -519,7 +512,7 @@ #define wxUSE_BMPBUTTON 1 // wxBitmapButton #define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl #define wxUSE_CHECKBOX 1 // wxCheckBox -#define wxUSE_CHECKLISTBOX 1 // wxCheckListBox (requires wxUSE_OWNER_DRAWN) +#define wxUSE_CHECKLISTBOX 1 // wxCheckListBox #define wxUSE_CHOICE 1 // wxChoice #define wxUSE_COMBOBOX 1 // wxComboBox #define wxUSE_GAUGE 1 // wxGauge @@ -536,7 +529,7 @@ #define wxUSE_STATTEXT 1 // wxStaticText #define wxUSE_STATBMP 1 // wxStaticBitmap #define wxUSE_TEXTCTRL 1 // wxTextCtrl -#define wxUSE_TOGGLEBTN 0 // requires wxButton //? not supported in generic and wrong in msw +#define wxUSE_TOGGLEBTN 0 // requires wxButton // currently not supported #define wxUSE_TREECTRL 1 // wxTreeCtrl // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR @@ -568,7 +561,7 @@ // wxUSE_TOOLBAR_SIMPLE. #define wxUSE_TOOLBAR 1 #define wxUSE_TOOLBAR_NATIVE 0 -#define wxUSE_TOOLBAR_SIMPLE 0 +#define wxUSE_TOOLBAR_SIMPLE 1 // this setting is obsolete, value is ignored #define wxUSE_BUTTONBAR 0 @@ -624,6 +617,14 @@ // Recommended setting: 1 (can be safely set to 0, not used by the library) #define wxUSE_CARET 1 +// Use wxDisplay class: it allows enumerating all displays on a system and +// working with them. +// +// Default is 0 because it isn't yet implemented on all platforms +// +// Recommended setting: 1 if you need it, can be safely set to 0 otherwise +#define wxUSE_DISPLAY 0 + // Miscellaneous geometry code: needed for Canvas library #define wxUSE_GEOMETRY 0 @@ -662,8 +663,8 @@ // Default is 1. // // Recommended setting: 1 -#if defined(__WIN32__) - #define wxUSE_TOOLTIPS 0 //? error 'SetWindow' cannot convert parameter 1 ... +#ifdef __WIN32__ + #define wxUSE_TOOLTIPS 1 #else #define wxUSE_TOOLTIPS 0 #endif @@ -674,6 +675,10 @@ // 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 + // ---------------------------------------------------------------------------- // common dialogs // ---------------------------------------------------------------------------- @@ -767,7 +772,7 @@ #define wxUSE_SPLASH 1 // wizards -#define wxUSE_WIZARDDLG 0 //? error '_wxArraywxArrayPages' redefinition +#define wxUSE_WIZARDDLG 1 // ---------------------------------------------------------------------------- // Metafiles support @@ -786,9 +791,15 @@ // Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS. // // Recommended setting: default or 0 for everything for portable programs. -#define wxUSE_METAFILE 0 -#define wxUSE_ENH_METAFILE 0 -#define wxUSE_WIN_METAFILES_ALWAYS 0 +#if defined(__WIN32__) + #define wxUSE_METAFILE 1 + #define wxUSE_ENH_METAFILE 1 + #define wxUSE_WIN_METAFILES_ALWAYS 0 +#else + #define wxUSE_METAFILE 0 + #define wxUSE_ENH_METAFILE 0 + #define wxUSE_WIN_METAFILES_ALWAYS 0 +#endif // ---------------------------------------------------------------------------- // Big GUI components @@ -812,9 +823,17 @@ // smaller library. #define wxUSE_HTML 1 -// OpenGL canvas +// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL +// headers and libraries to be able to compile the library with wxUSE_GLCANVAS +// set to 1. Note that for some compilers (notably Microsoft Visual C++) you +// will need to manually add opengl32.lib and glu32.lib to the list of +// libraries linked with your program if you use OpenGL. +// +// Default is 0. +// +// Recommended setting: 1 if you intend to use OpenGL, 0 otherwise #if defined(__WIN32__) - #define wxUSE_GLCANVAS 0 //? error unresolved external symbol ... + #define wxUSE_GLCANVAS 1 #else #define wxUSE_GLCANVAS 0 #endif @@ -831,14 +850,14 @@ // Default is 1. // // Recommended setting: 1 -#define wxUSE_CLIPBOARD 0 //? needs wxUSE_OLE +#define wxUSE_CLIPBOARD 1 // Use wxDataObject and related classes. Needed for clipboard and OLE drag and // drop // // Default is 1. // -// Recommended setting: 1 +// Recommended setting: 1 for WIN32 #define wxUSE_DATAOBJ 1 // Use wxDropTarget and wxDropSource classes for drag and drop (this is @@ -849,11 +868,19 @@ // // Recommended setting: 1 #if defined(__WIN32__) - #define wxUSE_DRAG_AND_DROP 0 //? needs wxUSE_OLE + #define wxUSE_DRAG_AND_DROP 1 #else #define wxUSE_DRAG_AND_DROP 0 #endif +// 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 // ---------------------------------------------------------------------------- @@ -887,8 +914,8 @@ // MS help #define wxUSE_MS_HTML_HELP 1 -// Use wxHTML-based help controller? -#define wxUSE_WXHTML_HELP 0 //? error 'type cast' cannot convert from ... +// Use wxHTML-based help controller +#define wxUSE_WXHTML_HELP 1 // Use resources #define wxUSE_RESOURCES 1 @@ -910,18 +937,10 @@ #endif // Use dynamic DIB loading/saving code in utils/dib under MSW. -#if defined(__WIN32__) - #define wxUSE_IMAGE_LOADING_IN_MSW 0 //? needs more testing -#else - #define wxUSE_IMAGE_LOADING_IN_MSW 0 -#endif +#define wxUSE_IMAGE_LOADING_IN_MSW 0 // Use dynamic icon/cursor loading/saving code under MSW. -#if defined(__WIN32__) - #define wxUSE_RESOURCE_LOADING_IN_MSW 0 //? needs more testing -#else - #define wxUSE_RESOURCE_LOADING_IN_MSW 0 -#endif +#define wxUSE_RESOURCE_LOADING_IN_MSW 0 // use wxExpr (a.k.a. PrologIO) #define wxUSE_PROLOGIO 0 @@ -1040,11 +1059,7 @@ #define wxUSE_ICO_CUR 0 // Set to 1 to compile in wxPalette class -#if defined(__WIN32__) - #define wxUSE_PALETTE 1 -#else - #define wxUSE_PALETTE 1 -#endif + #define wxUSE_PALETTE 1 // ---------------------------------------------------------------------------- // Windows-only settings @@ -1065,20 +1080,20 @@ // // Default is 1. // -// Recommended setting: 1 -#define wxUSE_OLE 0 //? needs more testing +// Recommended setting: 1 for WIN32 +#if defined(__WIN32__) + #define wxUSE_OLE 1 +#else + #define wxUSE_OLE 0 +#endif // 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__) //? wrong test, should be positive - #define wxUSE_CTL3D 0 -#else - #define wxUSE_CTL3D 0 //? see above -#endif +// Recommended setting: 0 +#define wxUSE_CTL3D 0 // 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 @@ -1086,12 +1101,8 @@ // // Default is 0 for (most) Win32 (systems), 1 for Win16 // -// Recommended setting: same as default -#if defined(__WIN95__) //? wrong test, should be positive - #define wxUSE_ITSY_BITSY 0 -#else - #define wxUSE_ITSY_BITSY 0 //? see above -#endif +// Recommended setting: 0 +#define wxUSE_ITSY_BITSY 0 // 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 @@ -1101,24 +1112,23 @@ // // Recommended setting: 1, only set it to 0 if your compiler doesn't have // or can't compile -#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__) +#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__) // TODO: This should be ifdef'ed for any compilers that don't support // RichEdit 2.0 but do have RichEdit 1.0... - #define wxUSE_RICHEDIT 0 //? needs more testing - #define wxUSE_RICHEDIT2 0 //? needs more testing + #define wxUSE_RICHEDIT 0 // currently not supported + #define wxUSE_RICHEDIT2 0 // currently not supported #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 required by wxUSE_CHECKLISTBOX. +// Set this to 1 to enable support for the owner-drawn menu and listboxes. // // Default is 1. // // Recommended setting: 1, set to 0 for a small library size reduction -#define wxUSE_OWNER_DRAWN 0 //? error 'MSWOnDraw' is not a member of 'wxControl' +#define wxUSE_OWNER_DRAWN 0 #endif @@ -1184,11 +1194,6 @@ #define wxUSE_NATIVE_STATUSBAR 0 #endif -#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 @@ -1207,14 +1212,6 @@ #define wxUSE_OWNER_DRAWN 0 #endif // __SALFORDC__ -#ifdef __TWIN32__ - #undef wxUSE_THREADS - #define wxUSE_THREADS 0 - - #undef wxUSE_ODBC - #define wxUSE_ODBC 0 -#endif // __TWIN32__ - // BC++/Win16 can't cope with the amount of data in resource.cpp #if defined(__WIN16__) && defined(__BORLANDC__) #undef wxUSE_WX_RESOURCES @@ -1298,23 +1295,10 @@ // unknown settings // ---------------------------------------------------------------------------- -// Use serialization (requires utils/serialize)? -#define wxUSE_SERIAL 0 - -// Use plotter? -#define wxUSE_PLOT 0 - // If 1, enables provision of run-time type information. // NOW MANDATORY: don't change. #define wxUSE_DYNAMIC_CLASSES 1 -//?????? -#if defined(__WIN32__) - #define wxUSE_DISPLAY 0 -#else - #define wxUSE_DISPLAY 0 -#endif - //?????? #if defined(__WIN32__) #define wxUSE_DDE_FOR_IPC 0