X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cb7e05cd1ffcbb55fea48643fb81e284869ddad..ed8385818f26035d2f60d3a719250ffab48e6c34:/src/gtk/spinctrl.cpp diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp index c859e71b29..5f8406cbe0 100644 --- a/src/gtk/spinctrl.cpp +++ b/src/gtk/spinctrl.cpp @@ -38,7 +38,7 @@ static void gtk_value_changed(GtkSpinButton* spinbutton, wxSpinCtrl* win) { win->m_pos = int(gtk_spin_button_get_value(spinbutton)); - if (!win->m_hasVMT || g_blockEventsOnDrag || win->m_blockScrollEvent) + if (!win->m_hasVMT || g_blockEventsOnDrag) return; wxCommandEvent event( wxEVT_COMMAND_SPINCTRL_UPDATED, win->GetId()); @@ -63,7 +63,7 @@ extern "C" { static void gtk_changed(GtkSpinButton* spinbutton, wxSpinCtrl* win) { - if (!win->m_hasVMT || win->m_blockScrollEvent) + if (!win->m_hasVMT) return; wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() ); @@ -106,14 +106,14 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id, } m_widget = gtk_spin_button_new_with_range(min, max, 1); - gtk_spin_button_set_value((GtkSpinButton*)m_widget, initial); - m_pos = int(gtk_spin_button_get_value((GtkSpinButton*)m_widget)); + gtk_spin_button_set_value( GTK_SPIN_BUTTON(m_widget), initial); + m_pos = (int) gtk_spin_button_get_value( GTK_SPIN_BUTTON(m_widget)); gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), (int)(m_windowStyle & wxSP_WRAP) ); - g_signal_connect(m_widget, "value_changed", G_CALLBACK(gtk_value_changed), this); - g_signal_connect(m_widget, "changed", G_CALLBACK(gtk_changed), this); + g_signal_connect_after(m_widget, "value_changed", G_CALLBACK(gtk_value_changed), this); + g_signal_connect_after(m_widget, "changed", G_CALLBACK(gtk_changed), this); m_parent->DoAddChild( this ); @@ -132,7 +132,7 @@ int wxSpinCtrl::GetMin() const wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") ); double min; - gtk_spin_button_get_range((GtkSpinButton*)m_widget, &min, NULL); + gtk_spin_button_get_range( GTK_SPIN_BUTTON(m_widget), &min, NULL); return int(min); } @@ -141,7 +141,7 @@ int wxSpinCtrl::GetMax() const wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") ); double max; - gtk_spin_button_get_range((GtkSpinButton*)m_widget, NULL, &max); + gtk_spin_button_get_range( GTK_SPIN_BUTTON(m_widget), NULL, &max); return int(max); } @@ -149,9 +149,11 @@ int wxSpinCtrl::GetValue() const { wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") ); - wx_const_cast(wxSpinCtrl*, this)->BlockScrollEvent(); + GtkDisableEvents(); gtk_spin_button_update( GTK_SPIN_BUTTON(m_widget) ); - wx_const_cast(wxSpinCtrl*, this)->UnblockScrollEvent(); + wx_const_cast(wxSpinCtrl*, this)->m_pos = + int(gtk_spin_button_get_value(GTK_SPIN_BUTTON(m_widget))); + GtkEnableEvents(); return m_pos; } @@ -169,9 +171,9 @@ void wxSpinCtrl::SetValue( const wxString& value ) else { // invalid number - set text as is (wxMSW compatible) - BlockScrollEvent(); + GtkDisableEvents(); gtk_entry_set_text( GTK_ENTRY(m_widget), wxGTK_CONV( value ) ); - UnblockScrollEvent(); + GtkEnableEvents(); } } @@ -179,9 +181,10 @@ void wxSpinCtrl::SetValue( int value ) { wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") ); - BlockScrollEvent(); - gtk_spin_button_set_value((GtkSpinButton*)m_widget, value); - UnblockScrollEvent(); + GtkDisableEvents(); + gtk_spin_button_set_value( GTK_SPIN_BUTTON(m_widget), value); + m_pos = (int) gtk_spin_button_get_value( GTK_SPIN_BUTTON(m_widget)); + GtkEnableEvents(); } void wxSpinCtrl::SetSelection(long from, long to) @@ -201,9 +204,29 @@ void wxSpinCtrl::SetRange(int minVal, int maxVal) { wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") ); - BlockScrollEvent(); - gtk_spin_button_set_range((GtkSpinButton*)m_widget, minVal, maxVal); - UnblockScrollEvent(); + GtkDisableEvents(); + gtk_spin_button_set_range( GTK_SPIN_BUTTON(m_widget), minVal, maxVal); + m_pos = int(gtk_spin_button_get_value(GTK_SPIN_BUTTON(m_widget))); + GtkEnableEvents(); +} + + +void wxSpinCtrl::GtkDisableEvents() const +{ + g_signal_handlers_block_by_func( m_widget, + (gpointer)gtk_value_changed, (void*) this); + + g_signal_handlers_block_by_func(m_widget, + (gpointer)gtk_changed, (void*) this); +} + +void wxSpinCtrl::GtkEnableEvents() const +{ + g_signal_handlers_unblock_by_func(m_widget, + (gpointer)gtk_value_changed, (void*) this); + + g_signal_handlers_unblock_by_func(m_widget, + (gpointer)gtk_changed, (void*) this); } void wxSpinCtrl::OnChar( wxKeyEvent &event )