From 363f7de02bf781db135d920408f0b8354386e45a Mon Sep 17 00:00:00 2001 From: David Elliott Date: Fri, 5 Sep 2003 18:40:00 +0000 Subject: [PATCH] Implement wxGauge git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/cocoa/gauge.h | 8 ++++---- src/cocoa/gauge.mm | 25 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/include/wx/cocoa/gauge.h b/include/wx/cocoa/gauge.h index 259b561674..8dd3529d93 100644 --- a/include/wx/cocoa/gauge.h +++ b/include/wx/cocoa/gauge.h @@ -56,12 +56,12 @@ protected: // ------------------------------------------------------------------------ public: // Pure Virtuals - virtual int GetValue() const { return 0; } - virtual void SetValue(int value) { } + virtual int GetValue() const; + virtual void SetValue(int value); // retrieve/change the range - virtual void SetRange(int maxValue) { } - int GetRange(void) const { return 0; } + virtual void SetRange(int maxValue); + int GetRange(void) const; }; #endif // __WX_COCOA_GAUGE_H__ diff --git a/src/cocoa/gauge.mm b/src/cocoa/gauge.mm index 58eca4a675..977de167ad 100644 --- a/src/cocoa/gauge.mm +++ b/src/cocoa/gauge.mm @@ -32,6 +32,10 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID winid, int range, return false; SetNSView([[NSProgressIndicator alloc] initWithFrame: MakeDefaultNSRect(size)]); [m_cocoaNSView release]; + + [(NSProgressIndicator*)m_cocoaNSView setMaxValue:range]; + [(NSProgressIndicator*)m_cocoaNSView setIndeterminate:NO]; + if(m_parent) m_parent->CocoaAddChild(this); SetInitialFrameRect(pos,size); @@ -43,4 +47,25 @@ wxGauge::~wxGauge() { } +int wxGauge::GetValue() const +{ + return [(NSProgressIndicator*)m_cocoaNSView doubleValue]; +} + +void wxGauge::SetValue(int value) +{ + [(NSProgressIndicator*)m_cocoaNSView setDoubleValue:value]; +} + +int wxGauge::GetRange() const +{ + return [(NSProgressIndicator*)m_cocoaNSView maxValue]; +} + +void wxGauge::SetRange(int maxValue) +{ + [(NSProgressIndicator*)m_cocoaNSView setMinValue:0.0]; + [(NSProgressIndicator*)m_cocoaNSView setMaxValue:maxValue]; +} + #endif // wxUSE_GAUGE -- 2.45.2