X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8375af8ff97a3649361b988a40b991a8cdaab09..37ed592f7106e4ba483baa6fba91a9c481048bbc:/src/gtk/spinbutt.cpp?ds=sidebyside diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp index 46bdce9690..b886fbc324 100644 --- a/src/gtk/spinbutt.cpp +++ b/src/gtk/spinbutt.cpp @@ -38,7 +38,7 @@ gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win) const double value = gtk_spin_button_get_value(spinbutton); const int pos = int(value); const int oldPos = win->m_pos; - if (!win->m_hasVMT || g_blockEventsOnDrag || win->m_blockScrollEvent || pos == oldPos) + if (!win->m_hasVMT || g_blockEventsOnDrag || pos == oldPos) { win->m_pos = pos; return; @@ -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); } } @@ -150,18 +150,20 @@ void wxSpinButton::SetValue( int value ) { wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") ); - BlockScrollEvent(); + GtkDisableEvents(); gtk_spin_button_set_value((GtkSpinButton*)m_widget, value); - UnblockScrollEvent(); + m_pos = int(gtk_spin_button_get_value((GtkSpinButton*)m_widget)); + GtkEnableEvents(); } void wxSpinButton::SetRange(int minVal, int maxVal) { wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") ); - BlockScrollEvent(); + GtkDisableEvents(); gtk_spin_button_set_range((GtkSpinButton*)m_widget, minVal, maxVal); - UnblockScrollEvent(); + m_pos = int(gtk_spin_button_get_value((GtkSpinButton*)m_widget)); + GtkEnableEvents(); } void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) ) @@ -172,6 +174,18 @@ void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) ) gtk_widget_set_size_request( m_widget, m_width, m_height ); } +void wxSpinButton::GtkDisableEvents() const +{ + g_signal_handlers_block_by_func(m_widget, + (gpointer)gtk_value_changed, (void*) this); +} + +void wxSpinButton::GtkEnableEvents() const +{ + g_signal_handlers_unblock_by_func(m_widget, + (gpointer)gtk_value_changed, (void*) this); +} + GdkWindow *wxSpinButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { return GTK_SPIN_BUTTON(m_widget)->panel;