Doc fixes A-M edition. Thanks to Arnout for pointing these out. Also I fixed some...

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

diff --git a/include/wx/os2/slider.h b/include/wx/os2/slider.h
index 887177c827ace0303dc197ee26fe32d57b0813ee..bc74fe394593cd4da61131aea9fbf18096f7ab08 100644 (file)
--- a/include/wx/os2/slider.h
+++ b/include/wx/os2/slider.h
@@ -27,9 +27,7 @@ public:
                   ,const wxPoint&     rPos = wxDefaultPosition
                   ,const wxSize&      rSize = wxDefaultSize
                   ,long               lStyle = wxSL_HORIZONTAL
                   ,const wxPoint&     rPos = wxDefaultPosition
                   ,const wxSize&      rSize = wxDefaultSize
                   ,long               lStyle = wxSL_HORIZONTAL

-#if wxUSE_VALIDATORS

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

-#endif

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


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

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -57,25 +53,20 @@ public:
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = wxSL_HORIZONTAL
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = wxSL_HORIZONTAL

-#if wxUSE_VALIDATORS

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

-#endif

                 ,const wxString&    rsName = wxSliderNameStr
                );
 
          virtual int  GetValue(void) const ;
          virtual void SetValue(int);
 
                 ,const wxString&    rsName = wxSliderNameStr
                );
 
          virtual int  GetValue(void) const ;
          virtual void SetValue(int);
 

-         virtual void DoGetSize( int* pnWidth
-                                ,int* pnHeight
-                               ) const;

                  void GetSize( int* pnX
                               ,int* pnY
                              ) const;
                  void GetPosition( int* pnX
                                   ,int* pnY
                                  ) const ;
                  void GetSize( int* pnX
                               ,int* pnY
                              ) const;
                  void GetPosition( int* pnX
                                   ,int* pnY
                                  ) const ;

-                 bool Show(bool bShow);
+                 bool Show(bool bShow = TRUE);

                  void SetRange( int nMinValue
                                ,int nMaxValue
                               );
                  void SetRange( int nMinValue
                                ,int nMaxValue
                               );


@@ -148,6 +139,9 @@ protected:
     int                             m_nThumbLength;
     int                             m_nSizeFlags;
 
     int                             m_nThumbLength;
     int                             m_nSizeFlags;
 

+    virtual void DoGetSize( int* pnWidth
+                           ,int* pnHeight
+                          ) const;

     virtual void DoSetSize( int  nX
                            ,int  nY
                            ,int  nWidth
     virtual void DoSetSize( int  nX
                            ,int  nY
                            ,int  nWidth