Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inherit wxGauge from wxGaugeBase in wxGTK

Browse Source 
Ensure the proper class hierarchy in wxGTK, this notably allows to override
SetValue() in classes derived from wxGauge, which didn't work in wxGTK (but
did in wxMSW and wxOSX) before.

Also remove the now unnecessary IsVertical().
This commit is contained in:
Vadim Zeitlin
2016-05-13 22:32:16 +02:00
parent 189e4c5024
commit a5d2f53f41
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/wx/gtk/gauge.h
View File

@@ -13,7 +13,7 @@
// wxGauge
//-----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxGauge: public wxControl
class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase
{
public:
wxGauge() { Init(); }
@@ -40,17 +40,14 @@ public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxGaugeNameStr );
// determinate mode API
void SetRange( int r );
void SetValue( int pos );
// implement base class virtual methods
void SetRange(int range) wxOVERRIDE;
int GetRange() const wxOVERRIDE;
int GetRange() const;
int GetValue() const;
void SetValue(int pos) wxOVERRIDE;
int GetValue() const wxOVERRIDE;
// indeterminate mode API
virtual void Pulse();
bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
virtual void Pulse() wxOVERRIDE;
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);