X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f923b2930e4aa9536d833cfb77b80615c0e5efe5..593354ca47abaae8a434f99642acc57f7834f77b:/src/gtk/spinbutt.cpp?ds=inline diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp index 748bf04ec3..b886fbc324 100644 --- a/src/gtk/spinbutt.cpp +++ b/src/gtk/spinbutt.cpp @@ -48,13 +48,13 @@ gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win) event.SetPosition(pos); event.SetEventObject(win); - if ((win->GetEventHandler()->ProcessEvent( event )) && + if ((win->HandleWindowEvent( event )) && !event.IsAllowed() ) { /* program has vetoed */ - win->BlockScrollEvent(); + // this will cause another "value_changed" signal, + // but because pos == oldPos nothing will happen gtk_spin_button_set_value(spinbutton, oldPos); - win->UnblockScrollEvent(); return; } @@ -64,7 +64,7 @@ gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win) wxSpinEvent event2(wxEVT_SCROLL_THUMBTRACK, win->GetId()); event2.SetPosition(pos); event2.SetEventObject(win); - win->GetEventHandler()->ProcessEvent(event2); + win->HandleWindowEvent(event2); } } @@ -162,6 +162,7 @@ void wxSpinButton::SetRange(int minVal, int maxVal) GtkDisableEvents(); gtk_spin_button_set_range((GtkSpinButton*)m_widget, minVal, maxVal); + m_pos = int(gtk_spin_button_get_value((GtkSpinButton*)m_widget)); GtkEnableEvents(); }