mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-15 10:39:13 +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.
82 lines
2.5 KiB
C++
82 lines
2.5 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/generic/fontpickerg.h
|
|
// Purpose: wxGenericFontButton header
|
|
// Author: Francesco Montorsi
|
|
// Modified by:
|
|
// Created: 14/4/2006
|
|
// Copyright: (c) Francesco Montorsi
|
|
// Licence: wxWindows Licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_FONTPICKER_H_
|
|
#define _WX_FONTPICKER_H_
|
|
|
|
#include "wx/button.h"
|
|
#include "wx/fontdata.h"
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxGenericFontButton: a button which brings up a wxFontDialog
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxGenericFontButton : public wxButton,
|
|
public wxFontPickerWidgetBase
|
|
{
|
|
public:
|
|
wxGenericFontButton() {}
|
|
wxGenericFontButton(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxFont &initial = wxNullFont,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxFONTBTN_DEFAULT_STYLE,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxFontPickerWidgetNameStr)
|
|
{
|
|
Create(parent, id, initial, pos, size, style, validator, name);
|
|
}
|
|
|
|
virtual wxColour GetSelectedColour() const
|
|
{ return m_data.GetColour(); }
|
|
|
|
virtual void SetSelectedColour(const wxColour &colour)
|
|
{ m_data.SetColour(colour); UpdateFont(); }
|
|
|
|
virtual ~wxGenericFontButton() {}
|
|
|
|
|
|
public: // API extensions specific for wxGenericFontButton
|
|
|
|
// user can override this to init font data in a different way
|
|
virtual void InitFontData();
|
|
|
|
// returns the font data shown in wxFontDialog
|
|
wxFontData *GetFontData() { return &m_data; }
|
|
|
|
|
|
public:
|
|
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxFont &initial = *wxNORMAL_FONT,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxFONTBTN_DEFAULT_STYLE,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxFontPickerWidgetNameStr);
|
|
|
|
void OnButtonClick(wxCommandEvent &);
|
|
|
|
|
|
protected:
|
|
|
|
void UpdateFont();
|
|
|
|
wxFontData m_data;
|
|
|
|
private:
|
|
wxDECLARE_DYNAMIC_CLASS(wxGenericFontButton);
|
|
};
|
|
|
|
|
|
#endif // _WX_FONTPICKER_H_
|