X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/36b3b54ad8431bca0fa53fa8acae5ba6d4c3e9c7..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/gtk1/gauge.h diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h index e75a0c41b5..42b516e2bf 100644 --- a/include/wx/gtk1/gauge.h +++ b/include/wx/gtk1/gauge.h @@ -1,21 +1,19 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gauge.h +// Name: wx/gtk1/gauge.h // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __GTKGAUGEH__ #define __GTKGAUGEH__ -#ifdef __GNUG__ -#pragma interface -#endif - #include "wx/defs.h" + +#if wxUSE_GAUGE + #include "wx/object.h" #include "wx/list.h" #include "wx/control.h" @@ -24,42 +22,47 @@ // classes //----------------------------------------------------------------------------- -class wxGauge; +class WXDLLIMPEXP_FWD_CORE wxGauge; //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -extern const char* wxGaugeNameStr; +extern WXDLLIMPEXP_CORE const wxChar wxGaugeNameStr[]; //----------------------------------------------------------------------------- // wxGaugeBox //----------------------------------------------------------------------------- -class wxGauge: public wxControl +class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase { - DECLARE_DYNAMIC_CLASS(wxGauge) - - public: - inline wxGauge() { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; } - - inline wxGauge( wxWindow *parent, wxWindowID id, int range, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxGA_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxGaugeNameStr ) +public: + wxGauge() { Init(); } + + wxGauge( wxWindow *parent, + wxWindowID id, + int range, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxGA_HORIZONTAL, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxGaugeNameStr ) { - Create(parent, id, range, pos, size, style, validator, name); + Init(); + + Create(parent, id, range, pos, size, style, validator, name); } - bool Create( wxWindow *parent, wxWindowID id, int range, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxGA_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxGaugeNameStr ); - void SetShadowWidth( int WXUNUSED(w) ) {}; - void SetBezelFace( int WXUNUSED(w) ) {}; + + bool Create( wxWindow *parent, + wxWindowID id, int range, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxGA_HORIZONTAL, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxGaugeNameStr ); + + void SetShadowWidth( int WXUNUSED(w) ) { } + void SetBezelFace( int WXUNUSED(w) ) { } void SetRange( int r ); void SetValue( int pos ); int GetShadowWidth() const { return 0; }; @@ -67,16 +70,34 @@ class wxGauge: public wxControl int GetRange() const; int GetValue() const; - // Are we a Win95/GTK progress bar, or a normal gauge? - inline bool GetProgressBar() const { return m_useProgressBar; } - - // implementation - - void ApplyWidgetStyle(); - - int m_rangeMax; - int m_gaugePos; - bool m_useProgressBar; + bool IsVertical() const { return HasFlag(wxGA_VERTICAL); } + + static wxVisualAttributes + GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + // implementation + // ------------- + + // the max and current gauge values + int m_rangeMax, + m_gaugePos; + +protected: + // common part of all ctors + void Init() { m_rangeMax = m_gaugePos = 0; } + + // set the gauge value to the value of m_gaugePos + void DoSetGauge(); + + virtual wxSize DoGetBestSize() const; + + virtual wxVisualAttributes GetDefaultAttributes() const; + +private: + DECLARE_DYNAMIC_CLASS(wxGauge) }; -#endif // __GTKGAUGEH__ +#endif + +#endif + // __GTKGAUGEH__