Fix recreating of wxBitmapComboBox using untyped client data.

[wxWidgets.git] / src / cocoa / scrolbar.mm

diff --git a/src/cocoa/scrolbar.mm b/src/cocoa/scrolbar.mm
index bfda3d24164985beb2bb44840ef36d36be3b9607..3d66286072c0b9519112997bc4019a2588c12fc3 100644 (file)
--- a/src/cocoa/scrolbar.mm
+++ b/src/cocoa/scrolbar.mm
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by: Mark Oxenham
 // Created:     2004/04/25
 // Author:      David Elliott
 // Modified by: Mark Oxenham
 // Created:     2004/04/25

-// RCS-ID:      $Id$

 // Copyright:   (c) 2004 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2004 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -21,7 +20,6 @@
 
 #import <AppKit/NSScroller.h>
 
 
 #import <AppKit/NSScroller.h>
 

-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)

 BEGIN_EVENT_TABLE(wxScrollBar, wxScrollBarBase)
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxScrollBar,NSScroller,NSControl,NSView)
 BEGIN_EVENT_TABLE(wxScrollBar, wxScrollBarBase)
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxScrollBar,NSScroller,NSControl,NSView)


@@ -176,7 +174,7 @@ void wxScrollBar::Cocoa_wxNSScrollerAction()
     wxScrollEvent event(command, GetId(), GetThumbPosition(),
         HasFlag(wxSB_VERTICAL)?wxVERTICAL:wxHORIZONTAL);
     event.SetEventObject(this);
     wxScrollEvent event(command, GetId(), GetThumbPosition(),
         HasFlag(wxSB_VERTICAL)?wxVERTICAL:wxHORIZONTAL);
     event.SetEventObject(this);

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

 }
 
 #endif // wxUSE_SCROLLBAR
 }
 
 #endif // wxUSE_SCROLLBAR