[ 1487463 ] XRC handler for wxOwnerDrawnComboBox.

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

diff --git a/include/wx/os2/gauge.h b/include/wx/os2/gauge.h
index d7dd800512cfaf1392ef15b504f478a561448f2c..9b8f2dca23347300afeb271d78a24129bab03aaa 100644 (file)
--- a/include/wx/os2/gauge.h
+++ b/include/wx/os2/gauge.h
@@ -25,9 +25,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
                   )
     {


@@ -37,9 +35,7 @@ public:
                ,rPos
                ,rSize
                ,lStyle
                ,rPos
                ,rSize
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -50,9 +46,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
                );
 


@@ -74,6 +68,10 @@ 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)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGauge)