mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-17 19:49:12 +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.
85 lines
2.7 KiB
C++
85 lines
2.7 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/gtk/slider.h
|
|
// Purpose:
|
|
// Author: Robert Roebling
|
|
// Copyright: (c) 1998 Robert Roebling
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GTK_SLIDER_H_
|
|
#define _WX_GTK_SLIDER_H_
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxSlider
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxSlider : public wxSliderBase
|
|
{
|
|
public:
|
|
wxSlider();
|
|
wxSlider(wxWindow *parent,
|
|
wxWindowID id,
|
|
int value, int minValue, int maxValue,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxSL_HORIZONTAL,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxSliderNameStr)
|
|
{
|
|
Create( parent, id, value, minValue, maxValue,
|
|
pos, size, style, validator, name );
|
|
}
|
|
~wxSlider();
|
|
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID id,
|
|
int value, int minValue, int maxValue,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxSL_HORIZONTAL,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxSliderNameStr);
|
|
|
|
// implement the base class pure virtuals
|
|
virtual int GetValue() const wxOVERRIDE;
|
|
virtual void SetValue(int value) wxOVERRIDE;
|
|
|
|
virtual void SetRange(int minValue, int maxValue) wxOVERRIDE;
|
|
virtual int GetMin() const wxOVERRIDE;
|
|
virtual int GetMax() const wxOVERRIDE;
|
|
|
|
virtual void SetLineSize(int lineSize) wxOVERRIDE;
|
|
virtual void SetPageSize(int pageSize) wxOVERRIDE;
|
|
virtual int GetLineSize() const wxOVERRIDE;
|
|
virtual int GetPageSize() const wxOVERRIDE;
|
|
|
|
virtual void SetThumbLength(int lenPixels) wxOVERRIDE;
|
|
virtual int GetThumbLength() const wxOVERRIDE;
|
|
|
|
static wxVisualAttributes
|
|
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
|
|
|
|
// implementation
|
|
void GTKDisableEvents();
|
|
void GTKEnableEvents();
|
|
bool GTKEventsDisabled() const;
|
|
|
|
double m_pos;
|
|
int m_scrollEventType;
|
|
bool m_needThumbRelease;
|
|
GtkWidget *m_scale;
|
|
|
|
protected:
|
|
GtkWidget *m_minLabel,*m_maxLabel;
|
|
bool m_blockScrollEvent;
|
|
|
|
virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE;
|
|
|
|
// set the slider value unconditionally
|
|
void GTKSetValue(int value);
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxSlider);
|
|
};
|
|
|
|
#endif // _WX_GTK_SLIDER_H_
|