Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/os2/gauge.h b/include/wx/os2/gauge.h
index 1b308d2c434e3045e23751cc09e32a1281b3bc10..083e9f13a7a0bb87740cda5c4d9ae1bf9d4a5c26 100644 (file)
--- 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:
 // Purpose:     wxGauge class
 // Author:      David Webster
 // Modified by:


@@ -12,9 +12,7 @@
 #ifndef _WX_GAUGE_H_
 #define _WX_GAUGE_H_
 
 #ifndef _WX_GAUGE_H_
 #define _WX_GAUGE_H_
 

-#include "wx/control.h"
-
-class WXDLLEXPORT wxGauge: public wxControl
+class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase

 {
 public:
     inline wxGauge() { m_nRangeMax = 0; m_nGaugePos = 0; }
 {
 public:
     inline wxGauge() { m_nRangeMax = 0; m_nGaugePos = 0; }


@@ -63,15 +61,18 @@ public:
     void SetValue(int nPos);
 
     inline virtual bool AcceptsFocus(void) const { return FALSE; }
     void SetValue(int nPos);
 
     inline virtual bool AcceptsFocus(void) const { return FALSE; }

-    inline virtual void Command(wxCommandEvent& WXUNUSED(rEvent)) {};
+    inline virtual void Command(wxCommandEvent& WXUNUSED(rEvent)) {}

 
 protected:
     int                             m_nRangeMax;
     int                             m_nGaugePos;
 
 protected:
     int                             m_nRangeMax;
     int                             m_nGaugePos;

+    int                             m_nWidth;
+    int                             m_nHeight;
+
+    wxSize DoGetBestSize(void) const;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxGauge)
 }; // end of CLASS wxGauge
 
 #endif // _WX_GAUGE_H_
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGauge)
 }; // end of CLASS wxGauge
 
 #endif // _WX_GAUGE_H_

-