support getting device resolution on all osx ports

[wxWidgets.git] / include / wx / cocoa / gauge.h

diff --git a/include/wx/cocoa/gauge.h b/include/wx/cocoa/gauge.h
index 8985ca0f87d4aeb922ff804609337248f7536c77..31c73d2e1a79943cee793a0c867c1f851b115355 100644 (file)
--- a/include/wx/cocoa/gauge.h
+++ b/include/wx/cocoa/gauge.h
@@ -6,7 +6,7 @@
 // Created:     2003/07/15
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/07/15
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_GAUGE_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_GAUGE_H__


@@ -14,10 +14,12 @@
 
 // #include "wx/cocoa/NSProgressIndicator.h"
 
 
 // #include "wx/cocoa/NSProgressIndicator.h"
 

+DECLARE_WXCOCOA_OBJC_CLASS(NSProgressIndicator);
+

 // ========================================================================
 // wxGauge
 // ========================================================================
 // ========================================================================
 // wxGauge
 // ========================================================================

-class WXDLLEXPORT wxGauge: public wxGaugeBase// , protected wxCocoaNSProgressIndicator
+class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase// , protected wxCocoaNSProgressIndicator

 {
     DECLARE_DYNAMIC_CLASS(wxGauge)
     DECLARE_EVENT_TABLE()
 {
     DECLARE_DYNAMIC_CLASS(wxGauge)
     DECLARE_EVENT_TABLE()


@@ -40,7 +42,7 @@ public:
     bool Create(wxWindow *parent, wxWindowID winid, int range,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
     bool Create(wxWindow *parent, wxWindowID winid, int range,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,

-            long style = wxSL_HORIZONTAL,
+            long style = wxGA_HORIZONTAL,

             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxGaugeNameStr);
     virtual ~wxGauge();
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxGaugeNameStr);
     virtual ~wxGauge();


@@ -48,18 +50,25 @@ public:
 // ------------------------------------------------------------------------
 // Cocoa callbacks
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
 // Cocoa callbacks
 // ------------------------------------------------------------------------

+public:
+    inline WX_NSProgressIndicator GetNSProgressIndicator() const { return (WX_NSProgressIndicator)m_cocoaNSView; }

 protected:
 protected:

+    // NSProgressIndicator cannot be enabled/disabled
+    virtual void CocoaSetEnabled(bool WXUNUSED(enable)) { }

 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 public:
     // Pure Virtuals
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 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;
+protected:
+    virtual wxSize DoGetBestSize() const;

 };
 
 };
 

-#endif // __WX_COCOA_GAUGE_H__
+#endif
+    // __WX_COCOA_GAUGE_H__