Fix typo in last commit

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

diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
index 044f6270e369fcda3b37199f35761ef31354fc49..c8e4780f1280981d7cfdd8a4d565108fbb213355 100644 (file)
--- a/src/gtk/spinbutt.cpp
+++ b/src/gtk/spinbutt.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        spinbutt.cpp
+// Name:        src/gtk/spinbutt.cpp

 // Purpose:     wxSpinButton
 // Author:      Robert
 // Modified by:
 // Purpose:     wxSpinButton
 // Author:      Robert
 // Modified by:


@@ -8,16 +8,18 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "spinbutt.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_SPINBTN

 
 #include "wx/spinbutt.h"
 
 #include "wx/spinbutt.h"

-#include "wx/utils.h"
-#include <math.h>

 
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // data
 
 //-----------------------------------------------------------------------------
 // data


@@ -25,181 +27,194 @@
 
 extern bool   g_blockEventsOnDrag;
 
 
 extern bool   g_blockEventsOnDrag;
 

-static const float sensitivity = 0.2;
-

 //-----------------------------------------------------------------------------
 // "value_changed"
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // "value_changed"
 //-----------------------------------------------------------------------------
 

-static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *win )
+extern "C" {
+static void
+gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win)

 {
 {

-    if (!win->HasVMT()) return;
-    if (g_blockEventsOnDrag) return;
-
-    float diff = win->m_adjust->value - win->m_oldPos;
-    if (fabs(diff) < sensitivity) return;
-    win->m_oldPos = win->m_adjust->value;
-
-    wxEventType command = wxEVT_NULL;
-
-    float line_step = win->m_adjust->step_increment;
-    float page_step = win->m_adjust->page_increment;
+    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)
+    {
+        win->m_pos = pos;
+        return;
+    }

 
 

-    if (fabs(diff-line_step) < sensitivity) command = wxEVT_SCROLL_LINEDOWN;
-    else if (fabs(diff+line_step) < sensitivity) command = wxEVT_SCROLL_LINEUP;
-    else if (fabs(diff-page_step) < sensitivity) command = wxEVT_SCROLL_PAGEDOWN;
-    else if (fabs(diff+page_step) < sensitivity) command = wxEVT_SCROLL_PAGEUP;
-    else command = wxEVT_SCROLL_THUMBTRACK;
+    wxSpinEvent event(pos > oldPos ? wxEVT_SCROLL_LINEUP : wxEVT_SCROLL_LINEDOWN, win->GetId());
+    event.SetPosition(pos);
+    event.SetEventObject(win);

 
 

-    int value = ceil(win->m_adjust->value);
+    if ((win->HandleWindowEvent( event )) &&
+        !event.IsAllowed() )
+    {
+        /* program has vetoed */
+        // this will cause another "value_changed" signal,
+        // but because pos == oldPos nothing will happen
+        gtk_spin_button_set_value(spinbutton, oldPos);
+        return;
+    }

 
 

-    wxSpinEvent event( command, win->GetId());
-    event.SetPosition( value );
-    event.SetOrientation( wxVERTICAL );
-    event.SetEventObject( win );
+    win->m_pos = pos;

 
 

-    win->GetEventHandler()->ProcessEvent( event );
+    /* always send a thumbtrack event */
+    wxSpinEvent event2(wxEVT_SCROLL_THUMBTRACK, win->GetId());
+    event2.SetPosition(pos);
+    event2.SetEventObject(win);
+    win->HandleWindowEvent(event2);
+}

 }
 
 //-----------------------------------------------------------------------------
 // wxSpinButton
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // wxSpinButton
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton,wxControl)
-

 BEGIN_EVENT_TABLE(wxSpinButton, wxControl)
     EVT_SIZE(wxSpinButton::OnSize)
 END_EVENT_TABLE()
 
 wxSpinButton::wxSpinButton()
 {
 BEGIN_EVENT_TABLE(wxSpinButton, wxControl)
     EVT_SIZE(wxSpinButton::OnSize)
 END_EVENT_TABLE()
 
 wxSpinButton::wxSpinButton()
 {

+    m_pos = 0;

 }
 
 }
 

-bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
-            long style, const wxString& name)
+bool wxSpinButton::Create(wxWindow *parent,
+                          wxWindowID id,
+                          const wxPoint& pos,
+                          const wxSize& size,
+                          long style,
+                          const wxString& name)

 {
 {

-    m_needParent = TRUE;
-
-    wxSize new_size = size;
-    new_size.x = 16;
+    wxSize new_size = size,
+           sizeBest = DoGetBestSize();
+    new_size.x = sizeBest.x;            // override width always

     if (new_size.y == -1)
     if (new_size.y == -1)

-        new_size.y = 30;
-
-    PreCreation( parent, id, pos, new_size, style, name );
-
-//  SetValidator( validator );
-
-    m_oldPos = 0.0;
-
-    m_adjust = (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 100.0, 1.0, 5.0, 0.0);
-
-    m_widget = gtk_spin_button_new( m_adjust, 0, 0 );
-
-    gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), (m_windowStyle & wxSP_WRAP) );
+        new_size.y = sizeBest.y;

 
 

-    gtk_signal_connect( GTK_OBJECT (m_adjust),
-                        "value_changed",
-                        (GtkSignalFunc) gtk_spinbutt_callback,
-                        (gpointer) this );
+    if (!PreCreation( parent, pos, new_size ) ||
+        !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxSpinButton creation failed") );
+        return false;
+    }

 
 

-    m_parent->AddChild( this );
+    m_pos = 0;

 
 

-    (m_parent->m_insertCallback)( m_parent, this );
+    m_widget = gtk_spin_button_new_with_range(0, 100, 1);
+    g_object_ref(m_widget);

 
 

-    PostCreation();
+    gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget),
+                              (int)(m_windowStyle & wxSP_WRAP) );

 
 

-    SetBackgroundColour( parent->GetBackgroundColour() );
+    g_signal_connect_after(
+        m_widget, "value_changed", G_CALLBACK(gtk_value_changed), this);

 
 

-    Show( TRUE );
+    m_parent->DoAddChild( this );

 
 

-    return TRUE;
-}
+    PostCreation(new_size);

 
 

-wxSpinButton::~wxSpinButton()
-{
+    return true;

 }
 
 int wxSpinButton::GetMin() const
 {
 }
 
 int wxSpinButton::GetMin() const
 {

-    wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
+    wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );

 
 

-    return ceil(m_adjust->lower);
+    double min;
+    gtk_spin_button_get_range((GtkSpinButton*)m_widget, &min, NULL);
+    return int(min);

 }
 
 int wxSpinButton::GetMax() const
 {
 }
 
 int wxSpinButton::GetMax() const
 {

-    wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
+    wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );

 
 

-    return ceil(m_adjust->upper);
+    double max;
+    gtk_spin_button_get_range((GtkSpinButton*)m_widget, NULL, &max);
+    return int(max);

 }
 
 int wxSpinButton::GetValue() const
 {
 }
 
 int wxSpinButton::GetValue() const
 {

-    wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
+    wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );

 
 

-    return ceil(m_adjust->value);
+    return m_pos;

 }
 
 void wxSpinButton::SetValue( int value )
 {
 }
 
 void wxSpinButton::SetValue( int value )
 {

-    wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
-
-    float fpos = (float)value;
-    m_oldPos = fpos;
-    if (fabs(fpos-m_adjust->value) < sensitivity) return;
-
-    m_adjust->value = fpos;
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );

 
 

-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+    GtkDisableEvents();
+    gtk_spin_button_set_value((GtkSpinButton*)m_widget, value);
+    m_pos = int(gtk_spin_button_get_value((GtkSpinButton*)m_widget));
+    GtkEnableEvents();

 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {

-    wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
-
-    float fmin = (float)minVal;
-    float fmax = (float)maxVal;
-
-    if ((fabs(fmin-m_adjust->lower) < sensitivity) &&
-        (fabs(fmax-m_adjust->upper) < sensitivity))
-    {
-        return;
-    }
-
-    m_adjust->lower = fmin;
-    m_adjust->upper = fmax;
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );

 
 

-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    GtkDisableEvents();
+    gtk_spin_button_set_range((GtkSpinButton*)m_widget, minVal, maxVal);
+    m_pos = int(gtk_spin_button_get_value((GtkSpinButton*)m_widget));
+    GtkEnableEvents();

 }
 
 void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
 }
 
 void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
 {

-    wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );

 
 

-    m_width = 16;
-    gtk_widget_set_usize( m_widget, m_width, m_height );
+    m_width = DoGetBestSize().x;
+    gtk_widget_set_size_request( m_widget, m_width, m_height );

 }
 
 }
 

-bool wxSpinButton::IsOwnGtkWindow( GdkWindow *window )
+bool wxSpinButton::Enable( bool enable )

 {
 {

-    return GTK_SPIN_BUTTON(m_widget)->panel == window;
+    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::ApplyWidgetStyle()
+void wxSpinButton::GtkDisableEvents() const

 {
 {

-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+    g_signal_handlers_block_by_func(m_widget,
+        (gpointer)gtk_value_changed, (void*) this);

 }
 
 }
 

-//-----------------------------------------------------------------------------
-// wxSpinEvent
-//-----------------------------------------------------------------------------
+void wxSpinButton::GtkEnableEvents() const
+{
+    g_signal_handlers_unblock_by_func(m_widget,
+        (gpointer)gtk_value_changed, (void*) this);
+}

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
+GdkWindow *wxSpinButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
+{
+    return GTK_SPIN_BUTTON(m_widget)->panel;
+}

 
 

-wxSpinEvent::wxSpinEvent(wxEventType commandType, int id):
-  wxScrollEvent(commandType, id)
+wxSize wxSpinButton::DoGetBestSize() const

 {
 {

+    wxSize best(15, 26); // FIXME
+    CacheBestSize(best);
+    return best;

 }
 
 }
 

+// static
+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);
+}

 
 

+#endif