Implement wxGauge

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cocoa/gauge.h b/include/wx/cocoa/gauge.h
index 259b5616747df764a44d0811175d81adfb111c39..8dd3529d9335c7d1700617fe9645c97f827b8930 100644 (file)
--- a/include/wx/cocoa/gauge.h
+++ b/include/wx/cocoa/gauge.h
@@ -56,12 +56,12 @@ protected:
 // ------------------------------------------------------------------------
 public:
     // Pure Virtuals
 // ------------------------------------------------------------------------
 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
 
     // 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__
 };
 
 #endif // __WX_COCOA_GAUGE_H__

diff --git a/src/cocoa/gauge.mm b/src/cocoa/gauge.mm
index 58eca4a6751f6637594e7ffdc5684a5dd40f0d68..977de167adb76c63d295e66c3fe4c58355bfedb4 100644 (file)
--- 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];
         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);
     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
 #endif // wxUSE_GAUGE