X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3103e8a97e834e9793f0eb149aa82a99fd64ef9a..9e759756262a27bdaf20e3f3c318660d86a7226f:/include/wx/msw/wince/setup.h?ds=sidebyside diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h index 8d346e5af2..0a2f18b8bf 100644 --- a/include/wx/msw/wince/setup.h +++ b/include/wx/msw/wince/setup.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/setup.h +// Name: wx/msw/wince/setup.h // Purpose: Configuration for the library // Author: Julian Smart // Modified by: @@ -13,7 +13,6 @@ #define _WX_SETUP_H_ /* --- start common options --- */ - // ---------------------------------------------------------------------------- // global settings // ---------------------------------------------------------------------------- @@ -28,15 +27,15 @@ // compatibility settings // ---------------------------------------------------------------------------- -// This setting determines the compatibility with 2.2 API: set it to 1 to +// This setting determines the compatibility with 2.4 API: set it to 1 to // enable it but please consider updating your code instead. // // Default is 0 // // Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_2_2 0 +#define WXWIN_COMPATIBILITY_2_4 0 -// This setting determines the compatibility with 2.4 API: set it to 0 to +// This setting determines the compatibility with 2.6 API: set it to 0 to // flag all cases of using deprecated functions. // // Default is 1 but please try building your code with 0 as the default will @@ -44,7 +43,7 @@ // in the version after it completely. // // Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_2_4 1 +#define WXWIN_COMPATIBILITY_2_6 1 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when // default system font is used for wxWindow::GetCharWidth/Height() instead of @@ -161,22 +160,6 @@ #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 // compiling the program in Unicode mode. More precisely, it will be possible // to construct wxString from a wide (Unicode) string and convert any wxString @@ -269,7 +252,7 @@ // Use standard C++ streams if 1. If 0, use wxWin streams implementation only. #define wxUSE_STD_IOSTREAM 0 -// Enable converion to standard C++ string if 1. +// Enable conversion to standard C++ string if 1. #define wxUSE_STD_STRING 0 // ---------------------------------------------------------------------------- @@ -487,21 +470,7 @@ // Default is 1. // // Recommended setting: 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 +#define wxUSE_MEDIACTRL 0 // Use GStreamer for Unix (req a lot of dependancies) // @@ -644,6 +613,14 @@ // Recommended setting: 1 #define wxUSE_CHOICEBOOK 1 +// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of +// the tabs +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_TREEBOOK 1 + // wxTabDialog is a generic version of wxNotebook but it is incompatible with // the new class. It shouldn't be used in new code. // @@ -884,6 +861,14 @@ // Recommended setting: 1 if you intend to use OpenGL, 0 otherwise #define wxUSE_GLCANVAS 0 +// wxRichTextCtrl allows editing of styled text. +// +// Default is 1. +// +// Recommended setting: 1, set to 0 if you want compile a +// smaller library. +#define wxUSE_RICHTEXT 1 + // ---------------------------------------------------------------------------- // Data transfer // ---------------------------------------------------------------------------- @@ -1084,10 +1069,6 @@ // NB: stuff which doesn't work at all under CE is forcefully disabled in // wx/msw/wince/chkconf.h -// wxCheckListBox requires wxOwnerDrawn which is disabled below -#undef wxUSE_CHECKLISTBOX -#define wxUSE_CHECKLISTBOX 0 - // Windows CE doesn't use RAS so wxDialUpManager doesn't work under it #undef wxUSE_DIALUP_MANAGER #define wxUSE_DIALUP_MANAGER 0 @@ -1095,9 +1076,6 @@ #undef wxUSE_DRAG_AND_DROP #define wxUSE_DRAG_AND_DROP 0 -#undef wxUSE_DYNAMIC_LOADER -#define wxUSE_DYNAMIC_LOADER 0 - #undef wxUSE_FSVOLUME #define wxUSE_FSVOLUME 0 @@ -1132,15 +1110,6 @@ #undef wxUSE_COMMON_DIALOGS #define wxUSE_COMMON_DIALOGS 1 -// ---------------------------------------------------------------------------- -// MSW settings not supported by CE -// ---------------------------------------------------------------------------- - -#define wxUSE_RICHEDIT 0 -#define wxUSE_RICHEDIT2 0 -#define wxUSE_UXTHEME 0 -#define wxUSE_UXTHEME_AUTO 0 - // ---------------------------------------------------------------------------- // Crash debugging helpers // ---------------------------------------------------------------------------- @@ -1157,7 +1126,6 @@ // obsolete MSW settings, don't change // ---------------------------------------------------------------------------- -#define wxUSE_ITSY_BITSY 0 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0 #endif // _WX_SETUP_H_