no changes, just remove #if'd out code

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

diff --git a/include/wx/cocoa/gauge.h b/include/wx/cocoa/gauge.h
index dd5228059ba160084297b8c7d8a30ae373052c3a..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__


@@ -19,7 +19,7 @@ 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()


@@ -42,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();


@@ -54,7 +54,7 @@ public:
     inline WX_NSProgressIndicator GetNSProgressIndicator() const { return (WX_NSProgressIndicator)m_cocoaNSView; }
 protected:
     // NSProgressIndicator cannot be enabled/disabled
     inline WX_NSProgressIndicator GetNSProgressIndicator() const { return (WX_NSProgressIndicator)m_cocoaNSView; }
 protected:
     // NSProgressIndicator cannot be enabled/disabled

-    virtual void CocoaSetEnabled(bool enable) { }
+    virtual void CocoaSetEnabled(bool WXUNUSED(enable)) { }

 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------


@@ -70,4 +70,5 @@ protected:
     virtual wxSize DoGetBestSize() const;
 };
 
     virtual wxSize DoGetBestSize() const;
 };
 

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