X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23f826bdf98d9f1570248cb926e7b7f233ed44dd..153530afb595110592776c461e52be99b1559439:/src/gtk1/slider.cpp?ds=sidebyside diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp index e0070f21ed..c0187f3cca 100644 --- a/src/gtk1/slider.cpp +++ b/src/gtk1/slider.cpp @@ -54,19 +54,19 @@ ProcessScrollEvent(wxSlider *win, wxEventType evtType, double dvalue) int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5); wxScrollEvent event( evtType, win->GetId(), value, orient ); event.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( event ); + win->HandleWindowEvent( event ); if ( evtType != wxEVT_SCROLL_THUMBTRACK ) { wxScrollEvent event2(wxEVT_SCROLL_CHANGED, win->GetId(), value, orient); event2.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( event2 ); + win->HandleWindowEvent( event2 ); } wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() ); cevent.SetEventObject( win ); cevent.SetInt( value ); - win->GetEventHandler()->ProcessEvent( cevent ); + win->HandleWindowEvent( cevent ); } //----------------------------------------------------------------------------- @@ -125,8 +125,6 @@ static gint gtk_slider_button_release_callback( GtkWidget *scale, // wxSlider //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl) - bool wxSlider::Create(wxWindow *parent, wxWindowID id, int value, int minValue, int maxValue, const wxPoint& pos, const wxSize& size, @@ -145,9 +143,9 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id, m_oldPos = 0.0; if (style & wxSL_VERTICAL) - m_widget = gtk_vscale_new( (GtkAdjustment *) NULL ); + m_widget = gtk_vscale_new( NULL ); else - m_widget = gtk_hscale_new( (GtkAdjustment *) NULL ); + m_widget = gtk_hscale_new( NULL ); if (style & wxSL_LABELS) {