mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-12 09:09:12 +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.
70 lines
2.3 KiB
C
70 lines
2.3 KiB
C
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/msvcrt.h
|
|
// Purpose: macros to use some non-standard features of MS Visual C++
|
|
// C run-time library
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 31.01.1999
|
|
// Copyright: (c) Vadim Zeitlin
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
// the goal of this file is to define wxCrtSetDbgFlag() macro which may be
|
|
// used like this:
|
|
// wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
|
|
// to turn on memory leak checks for programs compiled with Microsoft Visual
|
|
// C++ (5.0+). The macro will not be defined under other compilers or if it
|
|
// can't be used with MSVC for whatever reason.
|
|
|
|
#ifndef _MSW_MSVCRT_H_
|
|
#define _MSW_MSVCRT_H_
|
|
|
|
// use debug CRT functions for memory leak detections in VC++ 5.0+ in debug
|
|
// builds
|
|
#undef wxUSE_VC_CRTDBG
|
|
#if defined(_DEBUG) && defined(__VISUALC__) \
|
|
&& !defined(UNDER_CE)
|
|
// it doesn't combine well with wxWin own memory debugging methods
|
|
#if !wxUSE_GLOBAL_MEMORY_OPERATORS && !wxUSE_MEMORY_TRACING && !defined(__NO_VC_CRTDBG__)
|
|
#define wxUSE_VC_CRTDBG
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef wxUSE_VC_CRTDBG
|
|
// Need to undef new if including crtdbg.h which may redefine new itself
|
|
#ifdef new
|
|
#undef new
|
|
#endif
|
|
|
|
#include <stdlib.h>
|
|
|
|
// Defining _CRTBLD should never be necessary at all, but keep it for now
|
|
// as there is no time to retest all the compilers before 3.0 release.
|
|
// Definitely do not use it with MSVS 2013 as defining it results in errors
|
|
// if the standard <assert.h> is included afterwards.
|
|
#if !defined(_CRTBLD) && !wxCHECK_VISUALC_VERSION(12)
|
|
// Needed when building with pure MS SDK
|
|
#define _CRTBLD
|
|
#endif
|
|
|
|
#include <crtdbg.h>
|
|
|
|
#undef WXDEBUG_NEW
|
|
#define WXDEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
|
|
|
|
// this define works around a bug with inline declarations of new, see
|
|
//
|
|
// http://support.microsoft.com/kb/q140858/
|
|
//
|
|
// for the details
|
|
#define new WXDEBUG_NEW
|
|
|
|
#define wxCrtSetDbgFlag(flag) \
|
|
_CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | (flag))
|
|
#else // !using VC CRT
|
|
#define wxCrtSetDbgFlag(flag)
|
|
#endif // wxUSE_VC_CRTDBG
|
|
|
|
#endif // _MSW_MSVCRT_H_
|
|
|