Applied #15375 to stop event-sending in generic wxSpinCtrl ctor (eco)

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

diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp
index bc2977ba69f2f99be70f2c7b414c4adece742773..e7a38113ceccb9569626176ea6a9e2b7098289d8 100644 (file)
--- a/src/gtk1/scrolbar.cpp
+++ b/src/gtk1/scrolbar.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk1/scrolbar.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,8 +13,11 @@
 
 #include "wx/scrolbar.h"
 
-#include "wx/utils.h"
-#include "wx/math.h"
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/math.h"
+#endif
+
 #include "wx/gtk1/private.h"
 
 //-----------------------------------------------------------------------------
@@ -67,16 +69,16 @@ static void gtk_scrollbar_callback( GtkAdjustment *adjust,
     {
         wxScrollEvent event( g_currentUpDownEvent, win->GetId(), value, orient );
         event.SetEventObject( win );
-        win->GetEventHandler()->ProcessEvent( event );
+        win->HandleWindowEvent( event );
     }
 
     // throw other event (wxEVT_SCROLL_THUMBTRACK)
     wxScrollEvent event( command, win->GetId(), value, orient );
     event.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent( event );
+    win->HandleWindowEvent( event );
 
 /*
-    wxCommandEvent cevent( wxEVT_COMMAND_SCROLLBAR_UPDATED, win->GetId() );
+    wxCommandEvent cevent( wxEVT_SCROLLBAR, win->GetId() );
     cevent.SetEventObject( win );
     win->ProcessEvent( cevent );
 */
@@ -146,7 +148,7 @@ gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
 
         wxScrollEvent event( command, win->GetId(), value, orient );
         event.SetEventObject( win );
-        win->GetEventHandler()->ProcessEvent( event );
+        win->HandleWindowEvent( event );
     }
 
     win->m_isScrolling = false;
@@ -162,8 +164,6 @@ gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
 // wxScrollBar
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
-
 wxScrollBar::~wxScrollBar()
 {
 }
@@ -185,9 +185,9 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
     m_oldPos = 0.0;
 
     if ((style & wxSB_VERTICAL) == wxSB_VERTICAL)
-        m_widget = gtk_vscrollbar_new( (GtkAdjustment *) NULL );
+        m_widget = gtk_vscrollbar_new( NULL );
     else
-        m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL );
+        m_widget = gtk_hscrollbar_new( NULL );
 
     m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
 
@@ -362,4 +362,4 @@ wxScrollBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
     return GetDefaultAttributesFromGTKWidget(gtk_vscrollbar_new);
 }
 
-#endif
+#endif // wxUSE_SCROLLBAR