mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-13 01:29:11 +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.
45 lines
1.4 KiB
C++
45 lines
1.4 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/wrapgdip.h
|
|
// Purpose: wrapper around <gdiplus.h> header
|
|
// Author: Vadim Zeitlin
|
|
// Created: 2007-03-15
|
|
// Copyright: (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MSW_WRAPGDIP_H_
|
|
#define _WX_MSW_WRAPGDIP_H_
|
|
|
|
#include "wx/msw/wrapwin.h"
|
|
|
|
// these macros must be defined before gdiplus.h is included but we explicitly
|
|
// prevent windows.h from defining them in wx/msw/wrapwin.h as they conflict
|
|
// with standard functions of the same name elsewhere, so we have to pay for it
|
|
// by manually redefining them ourselves here
|
|
#ifndef max
|
|
#define max(a,b) (((a) > (b)) ? (a) : (b))
|
|
#endif
|
|
|
|
#ifndef min
|
|
#define min(a,b) (((a) < (b)) ? (a) : (b))
|
|
#endif
|
|
|
|
// There are many clashes between the names of the member fields and parameters
|
|
// in the standard gdiplus.h header and each of them results in C4458 with
|
|
// VC14, so disable this warning for this file as there is no other way to
|
|
// avoid it.
|
|
#ifdef __VISUALC__
|
|
#pragma warning(push)
|
|
#pragma warning(disable:4458) // declaration of 'xxx' hides class member
|
|
#endif
|
|
|
|
#include <gdiplus.h>
|
|
using namespace Gdiplus;
|
|
|
|
#ifdef __VISUALC__
|
|
#pragma warning(pop)
|
|
#endif
|
|
|
|
#endif // _WX_MSW_WRAPGDIP_H_
|
|
|