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.
58 lines
1.7 KiB
C
58 lines
1.7 KiB
C
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/wrapwin.h
|
|
// Purpose: Wrapper around <windows.h>, to be included instead of it
|
|
// Author: Vaclav Slavik
|
|
// Created: 2003/07/22
|
|
// Copyright: (c) 2003 Vaclav Slavik
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_WRAPWIN_H_
|
|
#define _WX_WRAPWIN_H_
|
|
|
|
#include "wx/platform.h"
|
|
|
|
// strict type checking to detect conversion from HFOO to HBAR at compile-time
|
|
#ifndef STRICT
|
|
#define STRICT 1
|
|
#endif
|
|
|
|
// this macro tells windows.h to not define min() and max() as macros: we need
|
|
// this as otherwise they conflict with standard C++ functions
|
|
#ifndef NOMINMAX
|
|
#define NOMINMAX
|
|
#endif // NOMINMAX
|
|
|
|
|
|
// before including windows.h, define version macros at (currently) maximal
|
|
// values because we do all our checks at run-time anyhow
|
|
#ifndef WINVER
|
|
#define WINVER 0x0603
|
|
#endif
|
|
|
|
// define _WIN32_WINNT and _WIN32_IE to the highest possible values because we
|
|
// always check for the version of installed DLLs at runtime anyway (see
|
|
// wxGetWinVersion() and wxApp::GetComCtl32Version()) unless the user really
|
|
// doesn't want to use APIs only available on later OS versions and had defined
|
|
// them to (presumably lower) values
|
|
#ifndef _WIN32_WINNT
|
|
#define _WIN32_WINNT 0x0603
|
|
#endif
|
|
|
|
#ifndef _WIN32_IE
|
|
#define _WIN32_IE 0x0700
|
|
#endif
|
|
|
|
// For IPv6 support, we must include winsock2.h before winsock.h, and
|
|
// windows.h include winsock.h so do it before including it
|
|
#if wxUSE_IPV6
|
|
#include <winsock2.h>
|
|
#endif
|
|
|
|
#include <windows.h>
|
|
|
|
// #undef the macros defined in winsows.h which conflict with code elsewhere
|
|
#include "wx/msw/winundef.h"
|
|
|
|
#endif // _WX_WRAPWIN_H_
|