mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-12 17:19:10 +01:00
822326eea9
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.
59 lines
2.3 KiB
C
59 lines
2.3 KiB
C
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/beforestd.h
|
|
// Purpose: #include before STL headers
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 07/07/03
|
|
// Copyright: (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
/**
|
|
Unfortunately, when compiling at maximum warning level, the standard
|
|
headers themselves may generate warnings -- and really lots of them. So
|
|
before including them, this header should be included to temporarily
|
|
suppress the warnings and after this the header afterstd.h should be
|
|
included to enable them back again.
|
|
|
|
Note that there are intentionally no inclusion guards in this file, because
|
|
it can be included several times.
|
|
*/
|
|
|
|
// VC 7.x isn't as bad as VC6 and doesn't give these warnings but eVC (which
|
|
// defines _MSC_VER as 1201) does need to be included as it's VC6-like
|
|
#if defined(__VISUALC__) && __VISUALC__ <= 1201
|
|
// these warning have to be disabled and not just temporarily disabled
|
|
// because they will be given at the end of the compilation of the
|
|
// current source and there is absolutely nothing we can do about them so
|
|
// disable them before warning(push) below
|
|
|
|
// 'foo': unreferenced inline function has been removed
|
|
#pragma warning(disable:4514)
|
|
|
|
// 'function' : function not inlined
|
|
#pragma warning(disable:4710)
|
|
|
|
// 'id': identifier was truncated to 'num' characters in the debug info
|
|
#pragma warning(disable:4786)
|
|
|
|
// we have to disable (and reenable in afterstd.h) this one because,
|
|
// even though it is of level 4, it is not disabled by warning(push, 1)
|
|
// below for VC7.1!
|
|
|
|
// unreachable code
|
|
#pragma warning(disable:4702)
|
|
|
|
#pragma warning(push, 1)
|
|
#endif // VC++ < 7
|
|
|
|
/**
|
|
GCC's visibility support is broken for libstdc++ in some older versions
|
|
(namely Debian/Ubuntu's GCC 4.1, see
|
|
https://bugs.launchpad.net/ubuntu/+source/gcc-4.1/+bug/109262). We fix it
|
|
here by mimicking newer versions' behaviour of using default visibility
|
|
for libstdc++ code.
|
|
*/
|
|
#if defined(HAVE_VISIBILITY) && defined(HAVE_BROKEN_LIBSTDCXX_VISIBILITY)
|
|
#pragma GCC visibility push(default)
|
|
#endif
|