X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/00dc9772321d7539fd155cdf529821f2fbfc82fb..0295d4483b9095d68f62085cb7455175edc7e743:/src/gtk/spinbutt.cpp diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp index ea7478c519..4ed8250624 100644 --- a/src/gtk/spinbutt.cpp +++ b/src/gtk/spinbutt.cpp @@ -48,7 +48,7 @@ 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 */ @@ -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); } } @@ -107,6 +107,7 @@ bool wxSpinButton::Create(wxWindow *parent, m_pos = 0; m_widget = gtk_spin_button_new_with_range(0, 100, 1); + g_object_ref(m_widget); gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), (int)(m_windowStyle & wxSP_WRAP) ); @@ -174,6 +175,20 @@ void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) ) gtk_widget_set_size_request( m_widget, m_width, m_height ); } +bool wxSpinButton::Enable( bool enable ) +{ + bool isEnabled = IsEnabled(); + + if ( !wxControl::Enable( enable ) ) + return false; + + // Work around lack of visual update when enabling + if (!isEnabled && enable) + GTKFixSensitivity(false /* fix even if not under mouse */); + + return true; +} + void wxSpinButton::GtkDisableEvents() const { g_signal_handlers_block_by_func(m_widget,