Fix return value of wxCountingOutputStream::LastWrite().

[wxWidgets.git] / src / gtk / spinbutt.cpp

diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
index 4ed8250624845a2774a879dd78c111ffc691d9c1..2a190e9e1c97c9afb49191fe72df407c60f25878 100644 (file)
--- 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;
     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;
     {
         win->m_pos = pos;
         return;


@@ -72,9 +72,6 @@ gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win)
 // wxSpinButton
 //-----------------------------------------------------------------------------
 
 // wxSpinButton
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton,wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
-

 BEGIN_EVENT_TABLE(wxSpinButton, wxControl)
     EVT_SIZE(wxSpinButton::OnSize)
 END_EVENT_TABLE()
 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 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
         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;
         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
 {
 
 GdkWindow *wxSpinButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {

+#ifdef __WXGTK3__
+    // no access to internal GdkWindows
+    return NULL;
+#else

     return GTK_SPIN_BUTTON(m_widget)->panel;
     return GTK_SPIN_BUTTON(m_widget)->panel;

+#endif

 }
 
 wxSize wxSpinButton::DoGetBestSize() const
 }
 
 wxSize wxSpinButton::DoGetBestSize() const


@@ -217,9 +217,7 @@ wxSize wxSpinButton::DoGetBestSize() const
 wxVisualAttributes
 wxSpinButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
 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
 }
 
 #endif