X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1abca322fd7a9a7abe6cc0b144987786faa0f05..4c1a4c41800b628d2fbd034da8a9cb45e3eec0bf:/src/gtk/spinbutt.cpp diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp index 86f7f8f5bf..6be5c3a209 100644 --- a/src/gtk/spinbutt.cpp +++ b/src/gtk/spinbutt.cpp @@ -91,8 +91,6 @@ bool wxSpinButton::Create(wxWindow *parent, long style, const wxString& name) { - m_needParent = true; - wxSize new_size = size, sizeBest = DoGetBestSize(); new_size.x = sizeBest.x; // override width always @@ -152,18 +150,18 @@ 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(); + 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(); + GtkEnableEvents(); } void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) ) @@ -174,6 +172,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;