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.
67 lines
1.8 KiB
C++
67 lines
1.8 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/systhemectrl.h
|
|
// Purpose: Class to make controls appear in the systems theme
|
|
// Author: Tobias Taschner
|
|
// Created: 2014-08-14
|
|
// Copyright: (c) 2014 wxWidgets development team
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_SYSTHEMECTRL_H
|
|
#define _WX_SYSTHEMECTRL_H
|
|
|
|
#include "wx/defs.h"
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxWindow;
|
|
|
|
class WXDLLIMPEXP_CORE wxSystemThemedControlBase
|
|
{
|
|
public:
|
|
wxSystemThemedControlBase() { }
|
|
|
|
virtual ~wxSystemThemedControlBase() { }
|
|
|
|
protected:
|
|
// This method is virtual and can be overridden, e.g. composite controls do
|
|
// it to enable the system theme for all of their parts.
|
|
virtual void DoEnableSystemTheme(bool enable, wxWindow* window);
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxSystemThemedControlBase);
|
|
};
|
|
|
|
// This class used CRTP, i.e. it should be instantiated for the real base class
|
|
// and inherited from.
|
|
template <class C>
|
|
class wxSystemThemedControl : public C,
|
|
public wxSystemThemedControlBase
|
|
{
|
|
public:
|
|
wxSystemThemedControl() { }
|
|
|
|
void EnableSystemTheme(bool enable = true)
|
|
{
|
|
DoEnableSystemTheme(enable, this);
|
|
}
|
|
|
|
protected:
|
|
wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxSystemThemedControl, C);
|
|
};
|
|
|
|
// Only __WXMSW__ has a non-trivial implementation currently.
|
|
#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
|
|
#define wxHAS_SYSTEM_THEMED_CONTROL
|
|
#endif
|
|
|
|
#ifndef wxHAS_SYSTEM_THEMED_CONTROL
|
|
|
|
inline void
|
|
wxSystemThemedControlBase::DoEnableSystemTheme(bool WXUNUSED(enable),
|
|
wxWindow* WXUNUSED(window))
|
|
{
|
|
// Nothing to do.
|
|
}
|
|
|
|
#endif // !wxHAS_SYSTEM_THEMED_CONTROL
|
|
|
|
#endif // _WX_SYSTHEMECTRL_H
|