X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dcf924a345ea8ffbc1cf6b40b5f75c6005e504c0..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk1/gauge.h diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h index 479d1d510d..c1d22c1a98 100644 --- a/include/wx/gtk1/gauge.h +++ b/include/wx/gtk1/gauge.h @@ -11,7 +11,7 @@ #ifndef __GTKGAUGEH__ #define __GTKGAUGEH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface #endif @@ -33,7 +33,7 @@ class wxGauge; // global data //----------------------------------------------------------------------------- -extern const char* wxGaugeNameStr; +extern const wxChar* wxGaugeNameStr; //----------------------------------------------------------------------------- // wxGaugeBox @@ -41,28 +41,33 @@ extern const char* wxGaugeNameStr; class wxGauge: public wxControl { - 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; }; @@ -70,16 +75,29 @@ 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 - + // implementation + // ------------- + void ApplyWidgetStyle(); - - int m_rangeMax; - int m_gaugePos; - bool m_useProgressBar; + + // the max and current gauge values + int m_rangeMax, + m_gaugePos; + + // obsolete functions, don't use +#ifdef WXWIN_COMPATIBILITY_2_2 + bool GetProgressBar() const { return TRUE; } +#endif // WXWIN_COMPATIBILITY_2_2 + +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(); + +private: + DECLARE_DYNAMIC_CLASS(wxGauge) }; #endif