mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-29 17:19:44 -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
60
Externals/wxWidgets3/wx/wxcocoa.h
vendored
60
Externals/wxWidgets3/wx/wxcocoa.h
vendored
@ -154,6 +154,8 @@
|
||||
|
||||
#define WXWIN_COMPATIBILITY_2_8 0
|
||||
|
||||
#define WXWIN_COMPATIBILITY_3_0 1
|
||||
|
||||
#define wxDIALOG_UNIT_COMPATIBILITY 0
|
||||
|
||||
|
||||
@ -203,6 +205,7 @@
|
||||
|
||||
#define wxUSE_PRINTF_POS_PARAMS 1
|
||||
|
||||
#define wxUSE_COMPILER_TLS 1
|
||||
|
||||
|
||||
#define wxUSE_STL 1
|
||||
@ -213,6 +216,7 @@
|
||||
#else
|
||||
#define wxUSE_STD_DEFAULT 0
|
||||
#endif
|
||||
#define wxUSE_STD_CONTAINERS_COMPATIBLY 1
|
||||
|
||||
#define wxUSE_STD_CONTAINERS 1
|
||||
|
||||
@ -267,7 +271,7 @@
|
||||
|
||||
#define wxUSE_SOCKETS 1
|
||||
|
||||
#define wxUSE_IPV6 0
|
||||
#define wxUSE_IPV6 1
|
||||
|
||||
#define wxUSE_FILESYSTEM 1
|
||||
|
||||
@ -315,7 +319,7 @@
|
||||
|
||||
#define wxUSE_SOUND 1
|
||||
|
||||
#define wxUSE_MEDIACTRL 1
|
||||
#define wxUSE_MEDIACTRL 0
|
||||
|
||||
#define wxUSE_XRC 0
|
||||
|
||||
@ -375,6 +379,7 @@
|
||||
|
||||
#define wxUSE_TIPWINDOW 1
|
||||
|
||||
#define wxUSE_ACTIVITYINDICATOR 1
|
||||
#define wxUSE_ANIMATIONCTRL 1
|
||||
#define wxUSE_BANNERWINDOW 1
|
||||
#define wxUSE_BUTTON 1
|
||||
@ -448,6 +453,8 @@
|
||||
|
||||
#define wxUSE_REARRANGECTRL 1
|
||||
|
||||
#define wxUSE_ADDREMOVECTRL 1
|
||||
|
||||
|
||||
#define wxUSE_ACCEL 1
|
||||
|
||||
@ -471,6 +478,8 @@
|
||||
|
||||
#define wxUSE_NOTIFICATION_MESSAGE 1
|
||||
|
||||
#define wxUSE_PREFERENCES_EDITOR 1
|
||||
|
||||
#define wxUSE_RICHTOOLTIP 1
|
||||
|
||||
#define wxUSE_SASH 1
|
||||
@ -509,6 +518,8 @@
|
||||
|
||||
#define wxUSE_PROGRESSDLG 1
|
||||
|
||||
#define wxUSE_NATIVE_PROGRESSDLG 1
|
||||
|
||||
#define wxUSE_STARTUP_TIPS 1
|
||||
|
||||
#define wxUSE_TEXTDLG 1
|
||||
@ -524,7 +535,7 @@
|
||||
#define wxUSE_FILE_HISTORY 1
|
||||
|
||||
|
||||
#define wxUSE_METAFILE 1
|
||||
#define wxUSE_METAFILE 0
|
||||
#define wxUSE_ENH_METAFILE 0
|
||||
#define wxUSE_WIN_METAFILES_ALWAYS 0
|
||||
|
||||
@ -535,11 +546,11 @@
|
||||
|
||||
#define wxUSE_MDI_ARCHITECTURE 1
|
||||
|
||||
#define wxUSE_PRINTING_ARCHITECTURE 1
|
||||
#define wxUSE_PRINTING_ARCHITECTURE 0
|
||||
|
||||
#define wxUSE_HTML 0
|
||||
|
||||
#define wxUSE_GLCANVAS 1
|
||||
#define wxUSE_GLCANVAS 0
|
||||
|
||||
#define wxUSE_RICHTEXT 0
|
||||
|
||||
@ -643,13 +654,18 @@
|
||||
*/
|
||||
#define wxUSE_GSTREAMER 0
|
||||
|
||||
#define wxUSE_GSTREAMER_PLAYER 0
|
||||
|
||||
/* --- start MSW options --- */
|
||||
|
||||
#ifndef wxUSE_UNICODE_MSLU
|
||||
#define wxUSE_UNICODE_MSLU 0
|
||||
#define wxUSE_GRAPHICS_GDIPLUS wxUSE_GRAPHICS_CONTEXT
|
||||
|
||||
#if defined(_MSC_VER) && _MSC_VER >= 1600
|
||||
#define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT
|
||||
#else
|
||||
#define wxUSE_GRAPHICS_DIRECT2D 0
|
||||
#endif
|
||||
|
||||
#define wxUSE_MFC 0
|
||||
|
||||
#define wxUSE_OLE 0
|
||||
|
||||
@ -657,6 +673,12 @@
|
||||
|
||||
#define wxUSE_ACTIVEX 0
|
||||
|
||||
#if defined(_MSC_VER) && _MSC_VER >= 1700
|
||||
#define wxUSE_WINRT 0
|
||||
#else
|
||||
#define wxUSE_WINRT 0
|
||||
#endif
|
||||
|
||||
#define wxUSE_DC_CACHEING 0
|
||||
|
||||
#define wxUSE_WXDIB 0
|
||||
@ -673,6 +695,9 @@
|
||||
|
||||
#define wxUSE_TASKBARICON_BALLOONS 0
|
||||
|
||||
#define wxUSE_TASKBARBUTTON 0
|
||||
|
||||
|
||||
#define wxUSE_UXTHEME 0
|
||||
|
||||
#define wxUSE_INKEDIT 0
|
||||
@ -800,25 +825,21 @@
|
||||
#define wxUSE_PLUGINS 0
|
||||
|
||||
/*
|
||||
* Use GTK print for printing under GTK+ 2.0
|
||||
* Use GTK print for printing under GTK+ 2.10+
|
||||
*/
|
||||
#define wxUSE_GTKPRINT 0
|
||||
/*
|
||||
* Use GNOME print for printing under GTK+ 2.0
|
||||
*/
|
||||
#define wxUSE_LIBGNOMEPRINT 0
|
||||
/*
|
||||
* Use GNOME VFS for MIME types
|
||||
*/
|
||||
#define wxUSE_LIBGNOMEVFS 0
|
||||
/*
|
||||
* Use the Hildon framework
|
||||
* Use libnotify library.
|
||||
*/
|
||||
#define wxUSE_LIBHILDON 0
|
||||
#define wxUSE_LIBNOTIFY 0
|
||||
/*
|
||||
* Use the Hildon 2.0 framework
|
||||
* Use libnotify 0.7+ API
|
||||
*/
|
||||
#define wxUSE_LIBHILDON2 0
|
||||
#define wxUSE_LIBNOTIFY_0_7 0
|
||||
/*
|
||||
* Use libXpm
|
||||
*/
|
||||
@ -839,7 +860,7 @@
|
||||
/*
|
||||
* Use OpenGL
|
||||
*/
|
||||
#define wxUSE_OPENGL 1
|
||||
#define wxUSE_OPENGL 0
|
||||
|
||||
/*
|
||||
* Use MS HTML Help via libmspack (Unix)
|
||||
@ -1267,8 +1288,5 @@
|
||||
/* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
|
||||
/* #undef wxHAS_WORKING_GTK_DC_BLIT */
|
||||
|
||||
#define wxUSE_COMPILER_TLS 1
|
||||
#define wxUSE_PREFERENCES_EDITOR 1
|
||||
|
||||
#endif /* __WX_SETUP_H__ */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user