mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-13 09:39: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.
110 lines
4.2 KiB
C++
110 lines
4.2 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/osx/radiobox.h
|
|
// Purpose: wxRadioBox class
|
|
// Author: Stefan Csomor
|
|
// Modified by:
|
|
// Created: 1998-01-01
|
|
// Copyright: (c) Stefan Csomor
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_RADIOBOX_H_
|
|
#define _WX_RADIOBOX_H_
|
|
|
|
// List box item
|
|
class WXDLLIMPEXP_FWD_CORE wxBitmap ;
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxRadioButton ;
|
|
|
|
class WXDLLIMPEXP_CORE wxRadioBox: public wxControl, public wxRadioBoxBase
|
|
{
|
|
wxDECLARE_DYNAMIC_CLASS(wxRadioBox);
|
|
public:
|
|
// Constructors & destructor
|
|
wxRadioBox();
|
|
wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
|
|
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
|
|
int n = 0, const wxString choices[] = NULL,
|
|
int majorDim = 0, long style = wxRA_SPECIFY_COLS,
|
|
const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr)
|
|
{
|
|
Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
|
|
}
|
|
wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
|
|
const wxPoint& pos, const wxSize& size,
|
|
const wxArrayString& choices,
|
|
int majorDim = 0, long style = wxRA_SPECIFY_COLS,
|
|
const wxValidator& val = wxDefaultValidator,
|
|
const wxString& name = wxRadioBoxNameStr)
|
|
{
|
|
Create(parent, id, title, pos, size, choices,
|
|
majorDim, style, val, name);
|
|
}
|
|
virtual ~wxRadioBox();
|
|
bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
|
|
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
|
|
int n = 0, const wxString choices[] = NULL,
|
|
int majorDim = 0, long style = wxRA_SPECIFY_COLS,
|
|
const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
|
|
bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
|
|
const wxPoint& pos, const wxSize& size,
|
|
const wxArrayString& choices,
|
|
int majorDim = 0, long style = wxRA_SPECIFY_COLS,
|
|
const wxValidator& val = wxDefaultValidator,
|
|
const wxString& name = wxRadioBoxNameStr);
|
|
|
|
// Enabling
|
|
virtual bool Enable(bool enable = true) wxOVERRIDE;
|
|
virtual bool Enable(unsigned int item, bool enable = true) wxOVERRIDE;
|
|
virtual bool IsItemEnabled(unsigned int item) const wxOVERRIDE;
|
|
|
|
// Showing
|
|
virtual bool Show(bool show = true) wxOVERRIDE;
|
|
virtual bool Show(unsigned int item, bool show = true) wxOVERRIDE;
|
|
virtual bool IsItemShown(unsigned int item) const wxOVERRIDE;
|
|
|
|
// Specific functions (in wxWidgets2 reference)
|
|
virtual void SetSelection(int item) wxOVERRIDE;
|
|
virtual int GetSelection() const wxOVERRIDE;
|
|
|
|
virtual unsigned int GetCount() const wxOVERRIDE { return m_noItems; }
|
|
|
|
virtual wxString GetString(unsigned int item) const wxOVERRIDE;
|
|
virtual void SetString(unsigned int item, const wxString& label) wxOVERRIDE;
|
|
|
|
virtual wxString GetLabel() const wxOVERRIDE;
|
|
virtual void SetLabel(const wxString& label) wxOVERRIDE;
|
|
|
|
// protect native font of box
|
|
virtual bool SetFont( const wxFont &font ) wxOVERRIDE;
|
|
// Other external functions
|
|
void Command(wxCommandEvent& event) wxOVERRIDE;
|
|
void SetFocus() wxOVERRIDE;
|
|
|
|
// Other variable access functions
|
|
int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
|
|
void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
|
|
|
|
void OnRadioButton( wxCommandEvent& event ) ;
|
|
|
|
protected:
|
|
// resolve ambiguity in base classes
|
|
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxRadioBoxBase::GetDefaultBorder(); }
|
|
|
|
wxRadioButton *m_radioButtonCycle;
|
|
|
|
unsigned int m_noItems;
|
|
int m_noRowsOrCols;
|
|
|
|
// Internal functions
|
|
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
|
virtual void DoSetSize(int x, int y,
|
|
int width, int height,
|
|
int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
|
|
|
|
wxDECLARE_EVENT_TABLE();
|
|
};
|
|
|
|
#endif
|
|
// _WX_RADIOBOX_H_
|