X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57c4d796c56bd48ce370240107f3e4c07e142985..8bda0ec6a3b0a7852eb0056f20a0dba7b07ea593:/include/wx/os2/gauge.h

diff --git a/include/wx/os2/gauge.h b/include/wx/os2/gauge.h
index cdb6d227f6..f64df99fc7 100644
--- a/include/wx/os2/gauge.h
+++ b/include/wx/os2/gauge.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gauge.h
+// Name:        wx/os2/gauge.h
 // Purpose:     wxGauge class
 // Author:      David Webster
 // Modified by:
@@ -12,66 +12,67 @@
 #ifndef _WX_GAUGE_H_
 #define _WX_GAUGE_H_
 
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
-
-class WXDLLEXPORT wxGauge: public wxControl
+class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase
 {
-  DECLARE_DYNAMIC_CLASS(wxGauge)
- public:
-  inline wxGauge() { m_rangeMax = 0; m_gaugePos = 0; }
+public:
+    inline wxGauge() { m_nRangeMax = 0; m_nGaugePos = 0; }
+
+    inline wxGauge( wxWindow*          pParent
+                   ,wxWindowID         vId
+                   ,int                nRange
+                   ,const wxPoint&     rPos = wxDefaultPosition
+                   ,const wxSize&      rSize = wxDefaultSize
+                   ,long               lStyle = wxGA_HORIZONTAL
+                   ,const wxValidator& rValidator = wxDefaultValidator
+                   ,const wxString&    rsName = wxGaugeNameStr
+                  )
+    {
+        Create( pParent
+               ,vId
+               ,nRange
+               ,rPos
+               ,rSize
+               ,lStyle
+               ,rValidator
+               ,rsName
+              );
+    }
 
-  inline wxGauge(wxWindow *parent, wxWindowID id,
-           int range,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxGA_HORIZONTAL,
-#if wxUSE_VALIDATORS
-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else
-           const wxValidator& validator = wxDefaultValidator,
-#  endif
-#endif
-           const wxString& name = wxGaugeNameStr)
-  {
-    Create(parent, id, range, pos, size, style, validator, name);
-  }
+    bool Create( wxWindow*          pParent
+                ,wxWindowID         vId
+                ,int                nRange
+                ,const wxPoint&     rPos = wxDefaultPosition
+                ,const wxSize&      rSize = wxDefaultSize
+                ,long               lStyle = wxGA_HORIZONTAL
+                ,const wxValidator& rValidator = wxDefaultValidator
+                ,const wxString&    rsName = wxGaugeNameStr
+               );
 
-  bool Create(wxWindow *parent, wxWindowID id,
-           int range,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxGA_HORIZONTAL,
-#if wxUSE_VALIDATORS
-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else
-           const wxValidator& validator = wxDefaultValidator,
-#  endif
-#endif
-           const wxString& name = wxGaugeNameStr);
+    int  GetShadowWidth(void) const;
+    int  GetBezelFace(void) const;
+    int  GetRange(void) const;
+    int  GetValue(void) const;
 
-  void SetShadowWidth(int w);
-  void SetBezelFace(int w);
-  void SetRange(int r);
-  void SetValue(int pos);
+    bool SetBackgroundColour(const wxColour& rColour);
+    void SetBezelFace(int nWidth);
+    bool SetForegroundColour(const wxColour& rColour);
+    void SetRange(int nRange);
+    void SetShadowWidth(int nWidth);
+    void SetValue(int nPos);
 
-  int GetShadowWidth() const ;
-  int GetBezelFace() const ;
-  int GetRange() const ;
-  int GetValue() const ;
+    inline virtual bool AcceptsFocus(void) const { return FALSE; }
+    inline virtual void Command(wxCommandEvent& WXUNUSED(rEvent)) {};
 
-  bool SetForegroundColour(const wxColour& col);
-  bool SetBackgroundColour(const wxColour& col);
+protected:
+    int                             m_nRangeMax;
+    int                             m_nGaugePos;
+    int                             m_nWidth;
+    int                             m_nHeight;
 
-  virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
+    wxSize DoGetBestSize(void) const;
 
- protected:
-   int      m_rangeMax;
-   int      m_gaugePos;
-};
+private:
+    DECLARE_DYNAMIC_CLASS(wxGauge)
+}; // end of CLASS wxGauge
 
-#endif
-    // _WX_GAUGE_H_
+#endif // _WX_GAUGE_H_