Merge in from trunk r68684 - r69046

[wxWidgets.git] / src / os2 / slider.cpp

diff --git a/src/os2/slider.cpp b/src/os2/slider.cpp
index 83752dd30b0bbe75d50dd71d248b46562050ca98..b15c673c1e14c0ea57c2e67bbbac23586b237b5f 100644 (file)
--- a/src/os2/slider.cpp
+++ b/src/os2/slider.cpp
@@ -368,7 +368,7 @@ bool wxSlider::Create(
                                                  ,NULL                     // no control data
                                                  ,NULL                     // no Presentation parameters
                                                 );
                                                  ,NULL                     // no control data
                                                  ,NULL                     // no Presentation parameters
                                                 );

-        if (GetFont().Ok())
+        if (GetFont().IsOk())

         {
             if (GetFont().GetResourceHandle())
             {
         {
             if (GetFont().GetResourceHandle())
             {


@@ -1074,7 +1074,7 @@ void wxSlider::SetTick(
 } // end of wxSlider::SetTick
 
 // For trackbars only
 } // end of wxSlider::SetTick
 
 // For trackbars only

-void wxSlider::SetTickFreq( int n, int WXUNUSED(nPos) )
+void wxSlider::DoSetTickFreq( int n )

 {
     SLDCDATA  vSlData;
     WNDPARAMS vWndParams;
 {
     SLDCDATA  vSlData;
     WNDPARAMS vWndParams;