X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/937013e0fd914d4c42f9f5ec98da665986b93dfa..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/gtk/spinbutt.cpp diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp index b886fbc324..2a190e9e1c 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 || pos == oldPos) + if (g_blockEventsOnDrag || pos == oldPos) { win->m_pos = pos; return; @@ -72,9 +72,6 @@ gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win) // wxSpinButton //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxSpinButton,wxControl) -IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent) - BEGIN_EVENT_TABLE(wxSpinButton, wxControl) EVT_SIZE(wxSpinButton::OnSize) END_EVENT_TABLE() @@ -107,6 +104,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 +172,18 @@ void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) ) gtk_widget_set_size_request( m_widget, m_width, m_height ); } +bool wxSpinButton::Enable( bool enable ) +{ + if (!base_type::Enable(enable)) + return false; + + // Work around lack of visual update when enabling + if (enable) + GTKFixSensitivity(false /* fix even if not under mouse */); + + return true; +} + void wxSpinButton::GtkDisableEvents() const { g_signal_handlers_block_by_func(m_widget, @@ -188,7 +198,12 @@ void wxSpinButton::GtkEnableEvents() const GdkWindow *wxSpinButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { +#ifdef __WXGTK3__ + // no access to internal GdkWindows + return NULL; +#else return GTK_SPIN_BUTTON(m_widget)->panel; +#endif } wxSize wxSpinButton::DoGetBestSize() const @@ -202,9 +217,7 @@ wxSize wxSpinButton::DoGetBestSize() const wxVisualAttributes wxSpinButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - // TODO: overload to accept functions like gtk_spin_button_new? - // Until then use a similar type - return GetDefaultAttributesFromGTKWidget(gtk_button_new); + return GetDefaultAttributesFromGTKWidget(gtk_spin_button_new_with_range(0, 100, 1)); } #endif