mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-30 01:29:42 -06:00
Update wxWidgets to 3.1.0
From wxWidgets master 81570ae070b35c9d52de47b1f14897f3ff1a66c7. include/wx/defs.h -- __w64 warning disable patch by comex brought forward. include/wx/msw/window.h -- added GetContentScaleFactor() which was not implemented on Windows but is necessary for wxBitmap scaling on Mac OS X so it needs to work to avoid #ifdef-ing the code. src/gtk/window.cpp -- Modified DoSetClientSize() to direct call wxWindowGTK::DoSetSize() instead of using public wxWindowBase::SetSize() which now prevents derived classes (like wxAuiToolbar) intercepting the call and breaking it. This matches Windows which does NOT need to call DoSetSize internally. End result is this fixes Dolphin's debug tools toolbars on Linux. src/osx/window_osx.cpp -- Same fix as for GTK since it has the same issue. src/msw/radiobox.cpp -- Hacked to fix display in HiDPI (was clipping off end of text). Updated CMakeLists for Linux and Mac OS X. Small code changes to Dolphin to fix debug error boxes, deprecation warnings, and retain previous UI behavior on Windows.
This commit is contained in:
EmptyChaos
230
Externals/wxWidgets3/wx/wxmsw.h
vendored
230
Externals/wxWidgets3/wx/wxmsw.h
vendored
@ -4,7 +4,6 @@
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
// Created: 01/02/97
|
||||
// RCS-ID: $Id: setup0.h 69463 2011-10-18 21:57:02Z VZ $
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -27,16 +26,6 @@
|
||||
// compatibility settings
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// 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
|
||||
// change to 0 in the next version and the deprecated functions will disappear
|
||||
// in the version after it completely.
|
||||
//
|
||||
// Recommended setting: 0 (please update your code)
|
||||
#define WXWIN_COMPATIBILITY_2_6 0
|
||||
|
||||
// This setting determines the compatibility with 2.8 API: set it to 0 to
|
||||
// flag all cases of using deprecated functions.
|
||||
//
|
||||
@ -47,6 +36,16 @@
|
||||
// Recommended setting: 0 (please update your code)
|
||||
#define WXWIN_COMPATIBILITY_2_8 0
|
||||
|
||||
// This setting determines the compatibility with 3.0 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
|
||||
// change to 0 in the next version and the deprecated functions will disappear
|
||||
// in the version after it completely.
|
||||
//
|
||||
// Recommended setting: 0 (please update your code)
|
||||
#define WXWIN_COMPATIBILITY_3_0 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
|
||||
// the current font.
|
||||
@ -151,7 +150,7 @@
|
||||
// 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 to 0 if using templates (at least for VC++). This switch is currently
|
||||
// ignored for mingw / cygwin / CodeWarrior
|
||||
// ignored for MinGW/Cygwin.
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
@ -267,6 +266,24 @@
|
||||
// Recommended setting: 1 if you want to support multiple languages
|
||||
#define wxUSE_PRINTF_POS_PARAMS 1
|
||||
|
||||
// Enable the use of compiler-specific thread local storage keyword, if any.
|
||||
// This is used for wxTLS_XXX() macros implementation and normally should use
|
||||
// the compiler-provided support as it's simpler and more efficient, but is
|
||||
// disabled under Windows in wx/msw/chkconf.h as it can't be used if wxWidgets
|
||||
// is used in a dynamically loaded Win32 DLL (i.e. using LoadLibrary()) under
|
||||
// XP as this triggers a bug in compiler TLS support that results in crashes
|
||||
// when any TLS variables are used.
|
||||
//
|
||||
// If you're absolutely sure that your build of wxWidgets is never going to be
|
||||
// used in such situation, either because it's not going to be linked from any
|
||||
// kind of plugin or because you only target Vista or later systems, you can
|
||||
// set this to 2 to force the use of compiler TLS even under MSW.
|
||||
//
|
||||
// Default is 1 meaning that compiler TLS is used only if it's 100% safe.
|
||||
//
|
||||
// Recommended setting: 2 if you want to have maximal performance and don't
|
||||
// care about the scenario described above.
|
||||
#define wxUSE_COMPILER_TLS 2
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Interoperability with the standard library.
|
||||
@ -283,33 +300,30 @@
|
||||
#define wxUSE_STL 0
|
||||
|
||||
// This is not a real option but is used as the default value for
|
||||
// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS.
|
||||
// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS_COMPATIBLY.
|
||||
//
|
||||
// Currently the Digital Mars and Watcom compilers come without standard C++
|
||||
// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have
|
||||
// them (e.g. from STLPort).
|
||||
// Set it to 0 if you want to disable the use of all standard classes
|
||||
// completely for some reason.
|
||||
#define wxUSE_STD_DEFAULT 1
|
||||
|
||||
// Use standard C++ containers where it can be done without breaking backwards
|
||||
// compatibility.
|
||||
//
|
||||
// VC++ 5.0 does include standard C++ library headers, however they produce
|
||||
// many warnings that can't be turned off when compiled at warning level 4.
|
||||
#if defined(__DMC__) || defined(__WATCOMC__) \
|
||||
|| (defined(_MSC_VER) && _MSC_VER < 1200)
|
||||
#define wxUSE_STD_DEFAULT 0
|
||||
#else
|
||||
#define wxUSE_STD_DEFAULT 1
|
||||
#endif
|
||||
// This provides better interoperability with the standard library, e.g. with
|
||||
// this option on it's possible to insert std::vector<> into many wxWidgets
|
||||
// containers directly.
|
||||
//
|
||||
// Default is 1.
|
||||
//
|
||||
// Recommended setting is 1 unless you want to avoid all dependencies on the
|
||||
// standard library.
|
||||
#define wxUSE_STD_CONTAINERS_COMPATIBLY wxUSE_STD_DEFAULT
|
||||
|
||||
// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<>
|
||||
// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but
|
||||
// usually more limited) implementations are used which allows to avoid the
|
||||
// dependency on the C++ run-time library.
|
||||
//
|
||||
// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't
|
||||
// support using standard containers and that VC6 needs non-default options for
|
||||
// such build to avoid getting "fatal error C1076: compiler limit : internal
|
||||
// heap limit reached; use /Zm to specify a higher limit" in its own standard
|
||||
// headers, so you need to ensure you do increase the heap size before enabling
|
||||
// this option for this compiler.
|
||||
//
|
||||
// Default is 0 for compatibility reasons.
|
||||
//
|
||||
// Recommended setting: 1 unless compatibility with the official wxWidgets
|
||||
@ -454,14 +468,7 @@
|
||||
#define wxUSE_XLOCALE 1
|
||||
|
||||
// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which
|
||||
// allow to manipulate dates, times and time intervals. wxDateTime replaces the
|
||||
// old wxTime and wxDate classes which are still provided for backwards
|
||||
// compatibility (and implemented in terms of wxDateTime).
|
||||
//
|
||||
// Note that this class is relatively new and is still officially in alpha
|
||||
// stage because some features are not yet (fully) implemented. It is already
|
||||
// quite useful though and should only be disabled if you are aiming at
|
||||
// absolutely minimal version of the library.
|
||||
// allow to manipulate dates, times and time intervals.
|
||||
//
|
||||
// Requires: wxUSE_LONGLONG
|
||||
//
|
||||
@ -548,7 +555,7 @@
|
||||
// Default is 1.
|
||||
//
|
||||
// Recommended setting: 1 if you need IPv6 support
|
||||
#define wxUSE_IPV6 0
|
||||
#define wxUSE_IPV6 1
|
||||
|
||||
// Set to 1 to enable virtual file systems (required by wxHTML)
|
||||
#define wxUSE_FILESYSTEM 1
|
||||
@ -660,7 +667,7 @@
|
||||
// Default is 1.
|
||||
//
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_MEDIACTRL 1
|
||||
#define wxUSE_MEDIACTRL 0
|
||||
|
||||
// Use wxWidget's XRC XML-based resource system. Recommended.
|
||||
//
|
||||
@ -717,51 +724,30 @@
|
||||
// Default is 1 on MSW
|
||||
//
|
||||
// Recommended setting: 1
|
||||
#ifdef __WXMSW__
|
||||
#define wxUSE_WEBVIEW_IE 0
|
||||
#else
|
||||
#define wxUSE_WEBVIEW_IE 0
|
||||
#endif
|
||||
|
||||
// Use the WebKit wxWebView backend
|
||||
//
|
||||
// Default is 1 on GTK and OSX
|
||||
//
|
||||
// Recommended setting: 1
|
||||
#if defined(__WXGTK__) || defined(__WXOSX__)
|
||||
#define wxUSE_WEBVIEW_WEBKIT 0
|
||||
#else
|
||||
#define wxUSE_WEBVIEW_WEBKIT 0
|
||||
#endif
|
||||
|
||||
// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
|
||||
// 2D drawing API. (Still somewhat experimental)
|
||||
//
|
||||
// Please note that on Windows gdiplus.dll is loaded dynamically which means
|
||||
// that nothing special needs to be done as long as you don't use
|
||||
// wxGraphicsContext at all or only use it on XP and later systems but you
|
||||
// still do need to distribute it yourself for an application using
|
||||
// wxGraphicsContext to be runnable on pre-XP systems.
|
||||
// Enable wxGraphicsContext and related classes for a modern 2D drawing API.
|
||||
//
|
||||
// Default is 1 except if you're using a non-Microsoft compiler under Windows
|
||||
// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g.
|
||||
// mingw32) you may need to install the headers (and just the headers)
|
||||
// yourself. If you do, change the setting below manually.
|
||||
// as only MSVC is known to ship with at least gdiplus.h which is required to
|
||||
// compile GDI+-based implementation of wxGraphicsContext (MSVC10 and later
|
||||
// versions also include d2d1.h required for Direct2D-based implementation).
|
||||
// For other compilers (e.g. mingw32) you may need to install the headers (and
|
||||
// just the headers) yourself. If you do, change the setting below manually.
|
||||
//
|
||||
// Recommended setting: 1 if supported by the compilation environment
|
||||
|
||||
// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
|
||||
// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
|
||||
#ifdef _MSC_VER
|
||||
# if _MSC_VER >= 1310
|
||||
// MSVC7.1+ comes with new enough Platform SDK, enable
|
||||
// wxGraphicsContext support for it
|
||||
# define wxUSE_GRAPHICS_CONTEXT 1
|
||||
# else
|
||||
// MSVC 6 didn't include GDI+ headers so disable by default, enable it
|
||||
// here if you use MSVC 6 with a newer SDK
|
||||
# define wxUSE_GRAPHICS_CONTEXT 0
|
||||
# endif
|
||||
# define wxUSE_GRAPHICS_CONTEXT 1
|
||||
#else
|
||||
// Disable support for other Windows compilers, enable it if your compiler
|
||||
// comes with new enough SDK or you installed the headers manually.
|
||||
@ -830,6 +816,7 @@
|
||||
// Default is 1
|
||||
//
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_ACTIVITYINDICATOR 1 // wxActivityIndicator
|
||||
#define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl
|
||||
#define wxUSE_BANNERWINDOW 1 // wxBannerWindow
|
||||
#define wxUSE_BUTTON 1 // wxButton
|
||||
@ -999,6 +986,16 @@
|
||||
// wxHeaderCtrl)
|
||||
#define wxUSE_REARRANGECTRL 1
|
||||
|
||||
// wxAddRemoveCtrl is a composite control containing a control showing some
|
||||
// items (e.g. wxListBox, wxListCtrl, wxTreeCtrl, wxDataViewCtrl, ...) and "+"/
|
||||
// "-" buttons allowing to add and remove items to/from the control.
|
||||
//
|
||||
// Default is 1.
|
||||
//
|
||||
// Recommended setting: 1 but can be safely set to 0 if you don't need it (not
|
||||
// used by the library itself).
|
||||
#define wxUSE_ADDREMOVECTRL 1
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Miscellaneous GUI stuff
|
||||
// ----------------------------------------------------------------------------
|
||||
@ -1087,6 +1084,16 @@
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_NOTIFICATION_MESSAGE 1
|
||||
|
||||
// wxPreferencesEditor provides a common API for different ways of presenting
|
||||
// the standard "Preferences" or "Properties" dialog under different platforms
|
||||
// (e.g. some use modal dialogs, some use modeless ones; some apply the changes
|
||||
// immediately while others require an explicit "Apply" button).
|
||||
//
|
||||
// Default is 1.
|
||||
//
|
||||
// Recommended setting: 1 (but can be safely disabled if you don't use it)
|
||||
#define wxUSE_PREFERENCES_EDITOR 1
|
||||
|
||||
// wxRichToolTip is a customizable tooltip class which has more functionality
|
||||
// than the stock (but native, unlike this class) wxToolTip.
|
||||
//
|
||||
@ -1200,6 +1207,10 @@
|
||||
// progress dialog class for lengthy operations
|
||||
#define wxUSE_PROGRESSDLG 1
|
||||
|
||||
// Set to 0 to disable the use of the native progress dialog (currently only
|
||||
// available under MSW and suffering from some bugs there, hence this option).
|
||||
#define wxUSE_NATIVE_PROGRESSDLG 1
|
||||
|
||||
// support for startup tips (wxShowTip &c)
|
||||
#define wxUSE_STARTUP_TIPS 1
|
||||
|
||||
@ -1273,7 +1284,7 @@
|
||||
#define wxUSE_MDI_ARCHITECTURE 1
|
||||
|
||||
// Set to 0 to disable print/preview architecture code
|
||||
#define wxUSE_PRINTING_ARCHITECTURE 1
|
||||
#define wxUSE_PRINTING_ARCHITECTURE 0
|
||||
|
||||
// wxHTML sublibrary allows to display HTML in wxWindow programs and much,
|
||||
// much more.
|
||||
@ -1290,12 +1301,11 @@
|
||||
// list of libraries used to link your application (although this is done
|
||||
// implicitly for Microsoft Visual C++ users).
|
||||
//
|
||||
// Default is 1 unless the compiler is known to ship without the necessary
|
||||
// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
|
||||
// Default is 1.
|
||||
//
|
||||
// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
|
||||
// otherwise.
|
||||
#define wxUSE_GLCANVAS 1
|
||||
#define wxUSE_GLCANVAS 0
|
||||
|
||||
// wxRichTextCtrl allows editing of styled text.
|
||||
//
|
||||
@ -1368,7 +1378,7 @@
|
||||
//
|
||||
// Recommended setting: 1, only set to 0 if you have trouble compiling
|
||||
// wxCHMHelpController (could be a problem with really ancient compilers)
|
||||
#define wxUSE_MS_HTML_HELP 1
|
||||
#define wxUSE_MS_HTML_HELP 0
|
||||
|
||||
|
||||
// Use wxHTML-based help controller?
|
||||
@ -1478,34 +1488,37 @@
|
||||
|
||||
/* --- start MSW options --- */
|
||||
// ----------------------------------------------------------------------------
|
||||
// Windows-only settings
|
||||
// Graphics backends choices for Windows
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// Set wxUSE_UNICODE_MSLU to 1 if you're compiling wxWidgets in Unicode mode
|
||||
// and want to run your programs under Windows 9x and not only 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).
|
||||
// The options here are only taken into account if wxUSE_GRAPHICS_CONTEXT is 1.
|
||||
|
||||
// Enable support for GDI+-based implementation of wxGraphicsContext.
|
||||
//
|
||||
// If your compiler doesn't have unicows.lib, you can get a version of it at
|
||||
// http://libunicows.sourceforge.net
|
||||
// Default is 1.
|
||||
//
|
||||
// Default is 0
|
||||
// Recommended setting: 1 if you need to support XP, as Direct2D is not
|
||||
// available there.
|
||||
#define wxUSE_GRAPHICS_GDIPLUS wxUSE_GRAPHICS_CONTEXT
|
||||
|
||||
// Enable support for Direct2D-based implementation of wxGraphicsContext.
|
||||
//
|
||||
// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems)
|
||||
#ifndef wxUSE_UNICODE_MSLU
|
||||
#define wxUSE_UNICODE_MSLU 0
|
||||
// Default is 1 for compilers which support it, i.e. VC10+ currently. If you
|
||||
// use an earlier MSVC version or another compiler and installed the necessary
|
||||
// SDK components manually, you need to change this setting.
|
||||
//
|
||||
// Recommended setting: 1 for faster and better quality graphics under Windows
|
||||
// 7 and later systems (if wxUSE_GRAPHICS_GDIPLUS is also enabled, earlier
|
||||
// systems will fall back on using GDI+).
|
||||
#if defined(_MSC_VER) && _MSC_VER >= 1600 && 0
|
||||
#define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT
|
||||
#else
|
||||
#define wxUSE_GRAPHICS_DIRECT2D 0
|
||||
#endif
|
||||
|
||||
// Set this to 1 if you want to use wxWidgets 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
|
||||
// ----------------------------------------------------------------------------
|
||||
// Windows-only settings
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// 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
|
||||
@ -1530,7 +1543,16 @@
|
||||
// Default is 1.
|
||||
//
|
||||
// Recommended setting: 1, required by wxMediaCtrl
|
||||
#define wxUSE_ACTIVEX 1
|
||||
#define wxUSE_ACTIVEX 0
|
||||
|
||||
// Enable WinRT support
|
||||
//
|
||||
// Default is 1 for compilers which support it, i.e. VS2012+ currently. If you
|
||||
// use an earlier MSVC version or another compiler and installed the necessary
|
||||
// SDK components manually, you need to change this setting.
|
||||
//
|
||||
// Recommended setting: 1
|
||||
#define wxUSE_WINRT 0
|
||||
|
||||
// wxDC caching implementation
|
||||
#define wxUSE_DC_CACHEING 1
|
||||
@ -1545,7 +1567,7 @@
|
||||
|
||||
// Set to 0 to disable PostScript print/preview architecture code under Windows
|
||||
// (just use Windows printing).
|
||||
#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
|
||||
#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
|
||||
|
||||
// Set this to 1 to compile in wxRegKey class.
|
||||
//
|
||||
@ -1588,6 +1610,15 @@
|
||||
// Recommended setting: 1, set to 0 for a tiny library size reduction
|
||||
#define wxUSE_TASKBARICON_BALLOONS 1
|
||||
|
||||
// Set this to 1 to enable following functionality added in Windows 7: thumbnail
|
||||
// representations, thumbnail toolbars, notification and status overlays,
|
||||
// progress indicators and jump lists.
|
||||
//
|
||||
// Default is 1.
|
||||
//
|
||||
// Recommended setting: 1, set to 0 for a tiny library size reduction
|
||||
#define wxUSE_TASKBARBUTTON 1
|
||||
|
||||
// Set to 1 to compile MS Windows XP theme engine support
|
||||
#define wxUSE_UXTHEME 1
|
||||
|
||||
@ -1631,11 +1662,8 @@
|
||||
// Default is 1 if supported by the compiler (VC++ and recent BC++ only).
|
||||
//
|
||||
// Recommended setting: 1, set to 0 if your programs never crash
|
||||
#define wxUSE_CRASHREPORT 1
|
||||
#define wxUSE_CRASHREPORT 0
|
||||
/* --- end MSW options --- */
|
||||
|
||||
#define wxUSE_COMPILER_TLS 1
|
||||
#define wxUSE_PREFERENCES_EDITOR 1
|
||||
|
||||
#endif // _WX_SETUP_H_
|
||||
|
||||
|
||||
Reference in New Issue
Block a user