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 committed
1 parent
3a26167148
commit
822326eea9
1748 files changed
+58817
-84428
No files matched your search
+41
-32
@@ -58,7 +58,7 @@
|
||||
should avoid doing it or provide unique prefixes then) but we have to do it
|
||||
differently for VC++
|
||||
*/
|
||||
#if defined(__VISUALC__) && (__VISUALC__ >= 1300)
|
||||
#if defined(__VISUALC__)
|
||||
/*
|
||||
__LINE__ handling is completely broken in VC++ when using "Edit and
|
||||
Continue" (/ZI option) and results in preprocessor errors if we use it
|
||||
@@ -83,7 +83,7 @@
|
||||
/*
|
||||
Helpers for defining macros that expand into a single statement.
|
||||
|
||||
The standatd solution is to use "do { ... } while (0)" statement but MSVC
|
||||
The standard solution is to use "do { ... } while (0)" statement but MSVC
|
||||
generates a C4127 "condition expression is constant" warning for it so we
|
||||
use something which is just complicated enough to not be recognized as a
|
||||
constant but still simple enough to be optimized away.
|
||||
@@ -93,29 +93,16 @@
|
||||
Notice that wxASSERT_ARG_TYPE in wx/strvargarg.h relies on these macros
|
||||
creating some kind of a loop because it uses "break".
|
||||
*/
|
||||
#ifdef __WATCOMC__
|
||||
#define wxFOR_ONCE(name) for(int name=0; name<1; name++)
|
||||
#define wxSTATEMENT_MACRO_BEGIN wxFOR_ONCE(wxMAKE_UNIQUE_NAME(wxmacro)) {
|
||||
#define wxSTATEMENT_MACRO_END }
|
||||
#else
|
||||
#define wxSTATEMENT_MACRO_BEGIN do {
|
||||
#define wxSTATEMENT_MACRO_END } while ( (void)0, 0 )
|
||||
#endif
|
||||
#define wxSTATEMENT_MACRO_BEGIN do {
|
||||
#define wxSTATEMENT_MACRO_END } while ( (void)0, 0 )
|
||||
|
||||
/*
|
||||
Define __WXFUNCTION__ which is like standard __FUNCTION__ but defined as
|
||||
NULL for the compilers which don't support the latter.
|
||||
*/
|
||||
#ifndef __WXFUNCTION__
|
||||
/* TODO: add more compilers supporting __FUNCTION__ */
|
||||
#if defined(__DMC__)
|
||||
/*
|
||||
__FUNCTION__ happens to be not defined within class members
|
||||
http://www.digitalmars.com/drn-bin/wwwnews?c%2B%2B.beta/485
|
||||
*/
|
||||
#define __WXFUNCTION__ (NULL)
|
||||
#elif defined(__GNUC__) || \
|
||||
(defined(_MSC_VER) && _MSC_VER >= 1300) || \
|
||||
#if defined(__GNUC__) || \
|
||||
defined(__VISUALC__) || \
|
||||
defined(__FUNCTION__)
|
||||
#define __WXFUNCTION__ __FUNCTION__
|
||||
#else
|
||||
@@ -130,19 +117,32 @@
|
||||
/* Any C99 or C++11 compiler should have them. */
|
||||
#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
|
||||
(defined(__cplusplus) && __cplusplus >= 201103L)
|
||||
#define HAVE_VARIADIC_MACROS
|
||||
#elif wxCHECK_GCC_VERSION(3,0)
|
||||
#define HAVE_VARIADIC_MACROS
|
||||
#define HAVE_VARIADIC_MACROS 1
|
||||
#elif defined(__GNUC__)
|
||||
#define HAVE_VARIADIC_MACROS 1
|
||||
#elif wxCHECK_VISUALC_VERSION(8)
|
||||
#define HAVE_VARIADIC_MACROS
|
||||
#elif wxCHECK_WATCOM_VERSION(1,2)
|
||||
#define HAVE_VARIADIC_MACROS
|
||||
#define HAVE_VARIADIC_MACROS 1
|
||||
#endif
|
||||
#endif /* !HAVE_VARIADIC_MACROS */
|
||||
|
||||
|
||||
|
||||
#ifdef HAVE_VARIADIC_MACROS
|
||||
|
||||
/*
|
||||
This is a hack to make it possible to use variadic macros with g++ 3.x even
|
||||
when using -pedantic[-errors] option: without this, it would complain that
|
||||
|
||||
"anonymous variadic macros were introduced in C99"
|
||||
|
||||
and the option disabling this warning (-Wno-variadic-macros) is only
|
||||
available in gcc 4.0 and later, so until then this hack is the only thing we
|
||||
can do.
|
||||
*/
|
||||
#if defined(__GNUC__) && __GNUC__ == 3
|
||||
#pragma GCC system_header
|
||||
#endif /* gcc-3.x */
|
||||
|
||||
/*
|
||||
wxCALL_FOR_EACH(what, ...) calls the macro from its first argument, what(pos, x),
|
||||
for every remaining argument 'x', with 'pos' being its 1-based index in
|
||||
@@ -164,14 +164,23 @@
|
||||
#define wxCALL_FOR_EACH_ARG_N(_1, _2, _3, _4, _5, _6, _7, _8, N, ...) N
|
||||
#define wxCALL_FOR_EACH_RSEQ_N() 8, 7, 6, 5, 4, 3, 2, 1, 0
|
||||
|
||||
#define wxCALL_FOR_EACH_1_(args) wxCALL_FOR_EACH_1 args
|
||||
#define wxCALL_FOR_EACH_2_(args) wxCALL_FOR_EACH_2 args
|
||||
#define wxCALL_FOR_EACH_3_(args) wxCALL_FOR_EACH_3 args
|
||||
#define wxCALL_FOR_EACH_4_(args) wxCALL_FOR_EACH_4 args
|
||||
#define wxCALL_FOR_EACH_5_(args) wxCALL_FOR_EACH_5 args
|
||||
#define wxCALL_FOR_EACH_6_(args) wxCALL_FOR_EACH_6 args
|
||||
#define wxCALL_FOR_EACH_7_(args) wxCALL_FOR_EACH_7 args
|
||||
#define wxCALL_FOR_EACH_8_(args) wxCALL_FOR_EACH_8 args
|
||||
|
||||
#define wxCALL_FOR_EACH_1(what, x) what(1, x)
|
||||
#define wxCALL_FOR_EACH_2(what, x, ...) what(2, x) wxCALL_FOR_EACH_1(what, __VA_ARGS__)
|
||||
#define wxCALL_FOR_EACH_3(what, x, ...) what(3, x) wxCALL_FOR_EACH_2(what, __VA_ARGS__)
|
||||
#define wxCALL_FOR_EACH_4(what, x, ...) what(4, x) wxCALL_FOR_EACH_3(what, __VA_ARGS__)
|
||||
#define wxCALL_FOR_EACH_5(what, x, ...) what(5, x) wxCALL_FOR_EACH_4(what, __VA_ARGS__)
|
||||
#define wxCALL_FOR_EACH_6(what, x, ...) what(6, x) wxCALL_FOR_EACH_5(what, __VA_ARGS__)
|
||||
#define wxCALL_FOR_EACH_7(what, x, ...) what(7, x) wxCALL_FOR_EACH_6(what, __VA_ARGS__)
|
||||
#define wxCALL_FOR_EACH_8(what, x, ...) what(8, x) wxCALL_FOR_EACH_7(what, __VA_ARGS__)
|
||||
#define wxCALL_FOR_EACH_2(what, x, ...) what(2, x) wxCALL_FOR_EACH_1_((what, __VA_ARGS__))
|
||||
#define wxCALL_FOR_EACH_3(what, x, ...) what(3, x) wxCALL_FOR_EACH_2_((what, __VA_ARGS__))
|
||||
#define wxCALL_FOR_EACH_4(what, x, ...) what(4, x) wxCALL_FOR_EACH_3_((what, __VA_ARGS__))
|
||||
#define wxCALL_FOR_EACH_5(what, x, ...) what(5, x) wxCALL_FOR_EACH_4_((what, __VA_ARGS__))
|
||||
#define wxCALL_FOR_EACH_6(what, x, ...) what(6, x) wxCALL_FOR_EACH_5_((what, __VA_ARGS__))
|
||||
#define wxCALL_FOR_EACH_7(what, x, ...) what(7, x) wxCALL_FOR_EACH_6_((what, __VA_ARGS__))
|
||||
#define wxCALL_FOR_EACH_8(what, x, ...) what(8, x) wxCALL_FOR_EACH_7_((what, __VA_ARGS__))
|
||||
|
||||
#define wxCALL_FOR_EACH_(N, args) \
|
||||
wxCONCAT(wxCALL_FOR_EACH_, N) args
|
||||
|
||||
Reference in new issue
Block a user