Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/os2/gauge.h b/include/wx/os2/gauge.h
index 67378ff770b2eb893a73cbd2df31117387fc4d1e..faac3db4b80ba7db1e5a1ae48d4b9e26ce73a9a8 100644 (file)
--- a/include/wx/os2/gauge.h
+++ b/include/wx/os2/gauge.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gauge.h
+// Name:        wx/os2/gauge.h

 // Purpose:     wxGauge class
 // Author:      David Webster
 // Modified by:
 // Created:     10/06/99
 // Purpose:     wxGauge class
 // Author:      David Webster
 // Modified by:
 // Created:     10/06/99

-// RCS-ID:      $Id$

 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,11 +11,7 @@
 #ifndef _WX_GAUGE_H_
 #define _WX_GAUGE_H_
 
 #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

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


@@ -27,9 +22,7 @@ public:
                    ,const wxPoint&     rPos = wxDefaultPosition
                    ,const wxSize&      rSize = wxDefaultSize
                    ,long               lStyle = wxGA_HORIZONTAL
                    ,const wxPoint&     rPos = wxDefaultPosition
                    ,const wxSize&      rSize = wxDefaultSize
                    ,long               lStyle = wxGA_HORIZONTAL

-#if wxUSE_VALIDATORS

                    ,const wxValidator& rValidator = wxDefaultValidator
                    ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                    ,const wxString&    rsName = wxGaugeNameStr
                   )
     {
                    ,const wxString&    rsName = wxGaugeNameStr
                   )
     {


@@ -39,9 +32,7 @@ public:
                ,rPos
                ,rSize
                ,lStyle
                ,rPos
                ,rSize
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -52,9 +43,7 @@ public:
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = wxGA_HORIZONTAL
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = wxGA_HORIZONTAL

-#if wxUSE_VALIDATORS

                 ,const wxValidator& rValidator = wxDefaultValidator
                 ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                 ,const wxString&    rsName = wxGaugeNameStr
                );
 
                 ,const wxString&    rsName = wxGaugeNameStr
                );
 


@@ -71,15 +60,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_

-