mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-18 03:59:14 +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.
47 lines
1.2 KiB
C++
47 lines
1.2 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/wrapcctl.h
|
|
// Purpose: Wrapper for the standard <commctrl.h> header
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 03.08.2003
|
|
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MSW_WRAPCCTL_H_
|
|
#define _WX_MSW_WRAPCCTL_H_
|
|
|
|
#include "wx/msw/wrapwin.h"
|
|
|
|
#include <commctrl.h>
|
|
|
|
// define things which might be missing from our commctrl.h
|
|
#include "wx/msw/missing.h"
|
|
|
|
// Set Unicode format for a common control
|
|
inline void wxSetCCUnicodeFormat(HWND hwnd)
|
|
{
|
|
::SendMessage(hwnd, CCM_SETUNICODEFORMAT, wxUSE_UNICODE, 0);
|
|
}
|
|
|
|
#if wxUSE_GUI
|
|
// Return the default font for the common controls
|
|
//
|
|
// this is implemented in msw/settings.cpp
|
|
class wxFont;
|
|
extern wxFont wxGetCCDefaultFont();
|
|
|
|
// this is just a wrapper for HDITEM which we can't use in the public header
|
|
// because we don't want to include commctrl.h (and hence windows.h) from there
|
|
struct wxHDITEM : public HDITEM
|
|
{
|
|
wxHDITEM()
|
|
{
|
|
::ZeroMemory(this, sizeof(*this));
|
|
}
|
|
};
|
|
|
|
#endif // wxUSE_GUI
|
|
|
|
#endif // _WX_MSW_WRAPCCTL_H_
|