X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad60f9e7b66d326505592cc6dae034cab5826f3b..92c9a59d7a44e82f98b149b95cb113be335ed200:/src/gtk/spinbutt.cpp diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp index 4ed8250624..52e8d4ce8f 100644 --- a/src/gtk/spinbutt.cpp +++ b/src/gtk/spinbutt.cpp @@ -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() @@ -177,13 +174,11 @@ void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) ) bool wxSpinButton::Enable( bool enable ) { - bool isEnabled = IsEnabled(); - - if ( !wxControl::Enable( enable ) ) + if (!base_type::Enable(enable)) return false; // Work around lack of visual update when enabling - if (!isEnabled && enable) + if (enable) GTKFixSensitivity(false /* fix even if not under mouse */); return true; @@ -203,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