mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-22 20:31:50 +02: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.
126 lines
3.6 KiB
C
126 lines
3.6 KiB
C
/*
|
|
* Name: wx/compiler.h
|
|
* Purpose: Compiler-specific macro definitions.
|
|
* Author: Vadim Zeitlin
|
|
* Created: 2013-07-13 (extracted from wx/platform.h)
|
|
* Copyright: (c) 1997-2013 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
* Licence: wxWindows licence
|
|
*/
|
|
|
|
/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
|
|
|
|
#ifndef _WX_COMPILER_H_
|
|
#define _WX_COMPILER_H_
|
|
|
|
/*
|
|
Compiler detection and related helpers.
|
|
*/
|
|
|
|
/*
|
|
Notice that Intel compiler can be used as Microsoft Visual C++ add-on and
|
|
so we should define both __INTELC__ and __VISUALC__ for it.
|
|
*/
|
|
#ifdef __INTEL_COMPILER
|
|
# define __INTELC__
|
|
#endif
|
|
|
|
#if defined(_MSC_VER)
|
|
/*
|
|
define another standard symbol for Microsoft Visual C++: the standard
|
|
one (_MSC_VER) is also defined by some other compilers.
|
|
*/
|
|
# define __VISUALC__ _MSC_VER
|
|
|
|
/*
|
|
define special symbols for different VC version instead of writing tests
|
|
for magic numbers such as 1200, 1300 &c repeatedly
|
|
*/
|
|
#if __VISUALC__ < 1300
|
|
# error "This Visual C++ version is not supported any longer (at least MSVC 2003 required)."
|
|
#elif __VISUALC__ < 1400
|
|
# define __VISUALC7__
|
|
#elif __VISUALC__ < 1500
|
|
# define __VISUALC8__
|
|
#elif __VISUALC__ < 1600
|
|
# define __VISUALC9__
|
|
#elif __VISUALC__ < 1700
|
|
# define __VISUALC10__
|
|
#elif __VISUALC__ < 1800
|
|
# define __VISUALC11__
|
|
#elif __VISUALC__ < 1900
|
|
# define __VISUALC12__
|
|
#elif __VISUALC__ < 2000
|
|
/* There is no __VISUALC13__! */
|
|
# define __VISUALC14__
|
|
#else
|
|
/*
|
|
Don't forget to update include/msvc/wx/setup.h as well when adding
|
|
support for a newer MSVC version here.
|
|
*/
|
|
# pragma message("Please update wx/compiler.h to recognize this VC++ version")
|
|
#endif
|
|
|
|
#elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
|
|
# define __BORLANDC__
|
|
#elif defined(__SUNPRO_CC)
|
|
# ifndef __SUNCC__
|
|
# define __SUNCC__ __SUNPRO_CC
|
|
# endif /* Sun CC */
|
|
#endif /* compiler */
|
|
|
|
/*
|
|
Macros for checking compiler version.
|
|
*/
|
|
|
|
/*
|
|
This macro can be used to test the gcc version and can be used like this:
|
|
|
|
# if wxCHECK_GCC_VERSION(3, 1)
|
|
... we have gcc 3.1 or later ...
|
|
# else
|
|
... no gcc at all or gcc < 3.1 ...
|
|
# endif
|
|
*/
|
|
#if defined(__GNUC__) && defined(__GNUC_MINOR__)
|
|
#define wxCHECK_GCC_VERSION( major, minor ) \
|
|
( ( __GNUC__ > (major) ) \
|
|
|| ( __GNUC__ == (major) && __GNUC_MINOR__ >= (minor) ) )
|
|
#else
|
|
#define wxCHECK_GCC_VERSION( major, minor ) 0
|
|
#endif
|
|
|
|
/*
|
|
This macro can be used to test the Visual C++ version.
|
|
*/
|
|
#ifndef __VISUALC__
|
|
# define wxVISUALC_VERSION(major) 0
|
|
# define wxCHECK_VISUALC_VERSION(major) 0
|
|
#else
|
|
/*
|
|
Things used to be simple with the _MSC_VER value and the version number
|
|
increasing in lock step, but _MSC_VER value of 1900 is VC14 and not the
|
|
non existing (presumably for the superstitious reasons) VC13, so we now
|
|
need to account for this with an extra offset.
|
|
*/
|
|
# define wxVISUALC_VERSION(major) ( (6 + (major >= 14 ? 1 : 0) + major) * 100 )
|
|
# define wxCHECK_VISUALC_VERSION(major) ( __VISUALC__ >= wxVISUALC_VERSION(major) )
|
|
#endif
|
|
|
|
/**
|
|
This is similar to wxCHECK_GCC_VERSION but for Sun CC compiler.
|
|
*/
|
|
#ifdef __SUNCC__
|
|
/*
|
|
__SUNCC__ is 0xVRP where V is major version, R release and P patch level
|
|
*/
|
|
#define wxCHECK_SUNCC_VERSION(maj, min) (__SUNCC__ >= (((maj)<<8) | ((min)<<4)))
|
|
#else
|
|
#define wxCHECK_SUNCC_VERSION(maj, min) (0)
|
|
#endif
|
|
|
|
/*
|
|
wxCHECK_MINGW32_VERSION() is defined in wx/msw/gccpriv.h which is included
|
|
later, see comments there.
|
|
*/
|
|
|
|
#endif // _WX_COMPILER_H_
|