removed unsecure wxTmpnam() function (patch by Francesco Montorsi)

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

diff --git a/include/wx/os2/gauge.h b/include/wx/os2/gauge.h
index 67378ff770b2eb893a73cbd2df31117387fc4d1e..5df97b19ae5e5b8ddbfe7e3db8c2ddac729b8020 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,11 +12,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 WXDLLEXPORT wxGauge: public wxGaugeBase

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


@@ -27,9 +23,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 +33,7 @@ public:
                ,rPos
                ,rSize
                ,lStyle
                ,rPos
                ,rSize
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -52,9 +44,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
                );
 


@@ -76,10 +66,13 @@ public:
 protected:
     int                             m_nRangeMax;
     int                             m_nGaugePos;
 protected:
     int                             m_nRangeMax;
     int                             m_nGaugePos;

+    int                             m_nWidth;
+    int                             m_nHeight;
+
+    wxSize wxGauge::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_

-