Fix recreating of wxBitmapComboBox using untyped client data.

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

diff --git a/src/os2/scrolbar.cpp b/src/os2/scrolbar.cpp
index 88906bdef78e0db2ece03fbaa4a80de5606d819a..fbb1fb2e9a5be633cdd247088b48a5ff4eccaea5 100644 (file)
--- a/src/os2/scrolbar.cpp
+++ b/src/os2/scrolbar.cpp
@@ -4,7 +4,6 @@
 // Author:      David Webster
 // Modified by:
 // Created:     10/15/99
 // Author:      David Webster
 // Modified by:
 // Created:     10/15/99

-// RCS-ID:      $Id$

 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,15 +11,14 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#include "wx/scrolbar.h"
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 #endif
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 #endif
 

-#include "wx/scrolbar.h"

 #include "wx/os2/private.h"
 
 #include "wx/os2/private.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
-

 // Scrollbar
 bool wxScrollBar::Create(wxWindow* pParent,
                          wxWindowID vId,
 // Scrollbar
 bool wxScrollBar::Create(wxWindow* pParent,
                          wxWindowID vId,


@@ -224,7 +222,7 @@ bool wxScrollBar::OS2OnScroll ( int    WXUNUSED(nOrientation),
     vEvent.SetOrientation(IsVertical() ? wxVERTICAL : wxHORIZONTAL);
     vEvent.SetPosition(nPosition);
     vEvent.SetEventObject(this);
     vEvent.SetOrientation(IsVertical() ? wxVERTICAL : wxHORIZONTAL);
     vEvent.SetPosition(nPosition);
     vEvent.SetEventObject(this);

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

 } // end of wxScrollBar::OS2OnScroll
 
 void wxScrollBar::SetThumbPosition ( int nViewStart )
 } // end of wxScrollBar::OS2OnScroll
 
 void wxScrollBar::SetThumbPosition ( int nViewStart )