mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-15 10:39:13 +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.
176 lines
4.7 KiB
C++
176 lines
4.7 KiB
C++
/**
|
|
* Name: wx/math.h
|
|
* Purpose: Declarations/definitions of common math functions
|
|
* Author: John Labenski and others
|
|
* Modified by:
|
|
* Created: 02/02/03
|
|
* Copyright: (c) John Labenski
|
|
* Licence: wxWindows licence
|
|
*/
|
|
|
|
/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
|
|
|
|
#ifndef _WX_MATH_H_
|
|
#define _WX_MATH_H_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#include <math.h>
|
|
|
|
#ifndef M_PI
|
|
#define M_PI 3.1415926535897932384626433832795
|
|
#endif
|
|
|
|
/* Scaling factors for various unit conversions: 1 inch = 2.54 cm */
|
|
#ifndef METRIC_CONVERSION_CONSTANT
|
|
#define METRIC_CONVERSION_CONSTANT (1/25.4)
|
|
#endif
|
|
|
|
#ifndef mm2inches
|
|
#define mm2inches (METRIC_CONVERSION_CONSTANT)
|
|
#endif
|
|
|
|
#ifndef inches2mm
|
|
#define inches2mm (1/(mm2inches))
|
|
#endif
|
|
|
|
#ifndef mm2twips
|
|
#define mm2twips (METRIC_CONVERSION_CONSTANT*1440)
|
|
#endif
|
|
|
|
#ifndef twips2mm
|
|
#define twips2mm (1/(mm2twips))
|
|
#endif
|
|
|
|
#ifndef mm2pt
|
|
#define mm2pt (METRIC_CONVERSION_CONSTANT*72)
|
|
#endif
|
|
|
|
#ifndef pt2mm
|
|
#define pt2mm (1/(mm2pt))
|
|
#endif
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
/* Any C++11 compiler should provide isfinite() */
|
|
#if __cplusplus >= 201103
|
|
#include <cmath>
|
|
#define wxFinite(x) std::isfinite(x)
|
|
#elif defined(__VISUALC__) || defined(__BORLANDC__)
|
|
#include <float.h>
|
|
#define wxFinite(x) _finite(x)
|
|
#elif defined(__MINGW64_TOOLCHAIN__) || defined(__clang__)
|
|
/*
|
|
add more compilers with C99 support here: using C99 isfinite() is
|
|
preferable to using BSD-ish finite()
|
|
*/
|
|
#if defined(_GLIBCXX_CMATH) || defined(_LIBCPP_CMATH)
|
|
// these <cmath> headers #undef isfinite
|
|
#define wxFinite(x) std::isfinite(x)
|
|
#else
|
|
#define wxFinite(x) isfinite(x)
|
|
#endif
|
|
#elif defined(wxNEEDS_STRICT_ANSI_WORKAROUNDS)
|
|
wxDECL_FOR_STRICT_MINGW32(int, _finite, (double))
|
|
|
|
#define wxFinite(x) _finite(x)
|
|
#elif ( defined(__GNUG__)||defined(__GNUWIN32__)|| \
|
|
defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \
|
|
defined(__HPUX__) ) && ( !defined(wxOSX_USE_IPHONE) || wxOSX_USE_IPHONE == 0 )
|
|
#ifdef __SOLARIS__
|
|
#include <ieeefp.h>
|
|
#endif
|
|
#define wxFinite(x) finite(x)
|
|
#else
|
|
#define wxFinite(x) ((x) == (x))
|
|
#endif
|
|
|
|
|
|
#if defined(__VISUALC__)||defined(__BORLAND__)
|
|
#define wxIsNaN(x) _isnan(x)
|
|
#elif defined(__GNUG__)||defined(__GNUWIN32__)|| \
|
|
defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \
|
|
defined(__HPUX__)
|
|
#define wxIsNaN(x) isnan(x)
|
|
#else
|
|
#define wxIsNaN(x) ((x) != (x))
|
|
#endif
|
|
|
|
#ifdef __INTELC__
|
|
|
|
inline bool wxIsSameDouble(double x, double y)
|
|
{
|
|
// VZ: this warning, given for operators==() and !=() is not wrong, as ==
|
|
// shouldn't be used with doubles, but we get too many of them and
|
|
// removing these operators is probably not a good idea
|
|
//
|
|
// Maybe we should always compare doubles up to some "epsilon" precision
|
|
#pragma warning(push)
|
|
|
|
// floating-point equality and inequality comparisons are unreliable
|
|
#pragma warning(disable: 1572)
|
|
|
|
return x == y;
|
|
|
|
#pragma warning(pop)
|
|
}
|
|
|
|
#else /* !__INTELC__ */
|
|
wxGCC_WARNING_SUPPRESS(float-equal)
|
|
inline bool wxIsSameDouble(double x, double y) { return x == y; }
|
|
wxGCC_WARNING_RESTORE(float-equal)
|
|
|
|
#endif /* __INTELC__/!__INTELC__ */
|
|
|
|
inline bool wxIsNullDouble(double x) { return wxIsSameDouble(x, 0.); }
|
|
|
|
inline int wxRound(double x)
|
|
{
|
|
wxASSERT_MSG( x > INT_MIN - 0.5 && x < INT_MAX + 0.5,
|
|
wxT("argument out of supported range") );
|
|
|
|
#if defined(HAVE_ROUND)
|
|
return int(round(x));
|
|
#else
|
|
return (int)(x < 0 ? x - 0.5 : x + 0.5);
|
|
#endif
|
|
}
|
|
|
|
// Convert between degrees and radians.
|
|
inline double wxDegToRad(double deg) { return (deg * M_PI) / 180.0; }
|
|
inline double wxRadToDeg(double rad) { return (rad * 180.0) / M_PI; }
|
|
|
|
#endif /* __cplusplus */
|
|
|
|
|
|
#if defined(__WINDOWS__)
|
|
#define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c )
|
|
#else
|
|
#define wxMulDivInt32( a , b , c ) (wxRound((a)*(((wxDouble)b)/((wxDouble)c))))
|
|
#endif
|
|
|
|
#if wxUSE_APPLE_IEEE
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
/* functions from common/extended.c */
|
|
WXDLLIMPEXP_BASE wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes);
|
|
WXDLLIMPEXP_BASE void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes);
|
|
|
|
/* use wxConvertFromIeeeExtended() and wxConvertToIeeeExtended() instead */
|
|
#if WXWIN_COMPATIBILITY_2_8
|
|
wxDEPRECATED( WXDLLIMPEXP_BASE wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes) );
|
|
wxDEPRECATED( WXDLLIMPEXP_BASE void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes) );
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif /* wxUSE_APPLE_IEEE */
|
|
|
|
/* Compute the greatest common divisor of two positive integers */
|
|
WXDLLIMPEXP_BASE unsigned int wxGCD(unsigned int u, unsigned int v);
|
|
|
|
#endif /* _WX_MATH_H_ */
|