reactivate commented out method

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

diff --git a/src/os2/slider.cpp b/src/os2/slider.cpp
index eec25e5f92f79eb3807f5878ce9a76c504c7208b..b15c673c1e14c0ea57c2e67bbbac23586b237b5f 100644 (file)
--- a/src/os2/slider.cpp
+++ b/src/os2/slider.cpp
@@ -28,8 +28,6 @@
 #include "wx/slider.h"
 #include "wx/os2/private.h"
 
 #include "wx/slider.h"
 #include "wx/os2/private.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
-

 wxSlider::wxSlider()
 {
     m_hStaticValue = 0L;
 wxSlider::wxSlider()
 {
     m_hStaticValue = 0L;


@@ -370,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())
             {


@@ -972,13 +970,13 @@ bool wxSlider::OS2OnScroll( int    WXUNUSED(nOrientation),
 
     vEvent.SetPosition(nNewPos);
     vEvent.SetEventObject(this);
 
     vEvent.SetPosition(nNewPos);
     vEvent.SetEventObject(this);

-    GetEventHandler()->ProcessEvent(vEvent);
+    HandleWindowEvent(vEvent);

 
     wxCommandEvent vCevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );
 
     vCevent.SetInt(nNewPos);
     vCevent.SetEventObject(this);
 
     wxCommandEvent vCevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );
 
     vCevent.SetInt(nNewPos);
     vCevent.SetEventObject(this);

-    return (GetEventHandler()->ProcessEvent(vCevent));
+    return (HandleWindowEvent(vCevent));

 } // end of wxSlider::OS2OnScroll
 
 void wxSlider::SetLineSize( int nLineSize )
 } // end of wxSlider::OS2OnScroll
 
 void wxSlider::SetLineSize( int nLineSize )


@@ -1076,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;