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.
82 lines
2.5 KiB
C++
82 lines
2.5 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/radiobut.h
|
|
// Purpose: wxRadioButton class
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 01/02/97
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_RADIOBUT_H_
|
|
#define _WX_RADIOBUT_H_
|
|
|
|
#include "wx/msw/ownerdrawnbutton.h"
|
|
|
|
class WXDLLIMPEXP_CORE wxRadioButton : public wxMSWOwnerDrawnButton<wxControl>
|
|
{
|
|
public:
|
|
// ctors and creation functions
|
|
wxRadioButton() { Init(); }
|
|
|
|
wxRadioButton(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxString& label,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxRadioButtonNameStr)
|
|
{
|
|
Init();
|
|
|
|
Create(parent, id, label, pos, size, style, validator, name);
|
|
}
|
|
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxString& label,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxRadioButtonNameStr);
|
|
|
|
// implement the radio button interface
|
|
virtual void SetValue(bool value);
|
|
virtual bool GetValue() const;
|
|
|
|
// implementation only from now on
|
|
virtual bool MSWCommand(WXUINT param, WXWORD id);
|
|
virtual void Command(wxCommandEvent& event);
|
|
|
|
virtual bool HasTransparentBackground() { return true; }
|
|
|
|
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
|
|
|
|
protected:
|
|
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
|
|
virtual wxSize DoGetBestSize() const;
|
|
|
|
// Implement wxMSWOwnerDrawnButtonBase methods.
|
|
virtual int MSWGetButtonStyle() const wxOVERRIDE;
|
|
virtual void MSWOnButtonResetOwnerDrawn() wxOVERRIDE;
|
|
virtual int MSWGetButtonCheckedFlag() const wxOVERRIDE;
|
|
virtual void
|
|
MSWDrawButtonBitmap(wxDC& dc, const wxRect& rect, int flags) wxOVERRIDE;
|
|
|
|
|
|
private:
|
|
// common part of all ctors
|
|
void Init();
|
|
|
|
|
|
// we need to store the state internally as the result of GetValue()
|
|
// sometimes gets out of sync in WM_COMMAND handler
|
|
bool m_isChecked;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxRadioButton);
|
|
};
|
|
|
|
#endif // _WX_RADIOBUT_H_
|