use explicit virtual keyword with overridden virtual methods

[wxWidgets.git] / include / wx / mac / carbon / gauge.h

diff --git a/include/wx/mac/carbon/gauge.h b/include/wx/mac/carbon/gauge.h
index 4eb5db3a69057b5f81f63edf16d1e9b79502c49e..b75005c4b782c21b5c5ce424860565b50e5c417f 100644 (file)
--- a/include/wx/mac/carbon/gauge.h
+++ b/include/wx/mac/carbon/gauge.h
@@ -12,20 +12,15 @@
 #ifndef _WX_GAUGE_H_
 #define _WX_GAUGE_H_
 
 #ifndef _WX_GAUGE_H_
 #define _WX_GAUGE_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "gauge.h"
-#endif
-

 #include "wx/control.h"
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxGaugeNameStr[];

 
 // Group box
 class WXDLLEXPORT wxGauge: public wxGaugeBase
 {
 
 // Group box
 class WXDLLEXPORT wxGauge: public wxGaugeBase
 {

-  DECLARE_DYNAMIC_CLASS(wxGauge)

  public:
  public:

-  inline wxGauge() { m_rangeMax = 0; m_gaugePos = 0; }
+  inline wxGauge() { }

 
   inline wxGauge(wxWindow *parent, wxWindowID id,
            int range,
 
   inline wxGauge(wxWindow *parent, wxWindowID id,
            int range,


@@ -46,21 +41,15 @@ class WXDLLEXPORT wxGauge: public wxGaugeBase
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxGaugeNameStr);
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxGaugeNameStr);
 

-  void SetShadowWidth(int w);
-  void SetBezelFace(int w);
-  void SetRange(int r);
-  void SetValue(int pos);
-
-  int GetShadowWidth() const ;
-  int GetBezelFace() const ;
-  int GetRange() const ;
-  int GetValue() const ;
+    // set gauge range/value
+    virtual void SetRange(int range);
+    virtual void SetValue(int pos);
+    virtual int  GetValue() const ;

 
 

-  virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
+    void Pulse();

 
  protected:
 
  protected:

-   int      m_rangeMax;
-   int      m_gaugePos;
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge)

 };
 
 #endif
 };
 
 #endif