X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fa8a793a6ffea7e83559f89fa3a32e169ebc672c..2e334012b4babcf063fbe79540c4c154cd54ab2b:/src/gtk/spinctrl.cpp

diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index c2091178b6..77a9cb485b 100644
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        spinbutt.cpp
+// Name:        src/gtk/spinbutt.cpp
 // Purpose:     wxSpinCtrl
 // Author:      Robert
 // Modified by:
@@ -8,31 +8,20 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "spinctrl.h"
-#endif
-
-#include "wx/spinctrl.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #if wxUSE_SPINCTRL
 
-#include "wx/utils.h"
-
-#include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
-
-#include <math.h>
-
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
+#include "wx/spinctrl.h"
 
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+#ifndef WX_PRECOMP
+    #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
+    #include "wx/utils.h"
+    #include "wx/wxcrtvararg.h"
+#endif
 
-static const float sensitivity = 0.02;
+#include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------
 // data
@@ -44,15 +33,13 @@ extern bool   g_blockEventsOnDrag;
 // "value_changed"
 //-----------------------------------------------------------------------------
 
-static void gtk_spinctrl_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win )
+extern "C" {
+static void
+gtk_value_changed(GtkSpinButton* spinbutton, wxSpinCtrlGTKBase* win)
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!win->m_hasVMT) return;
-    if (g_blockEventsOnDrag) return;
-
-    wxCommandEvent event( wxEVT_COMMAND_SPINCTRL_UPDATED, win->GetId());
-    event.SetEventObject( win );
+    win->m_value = gtk_spin_button_get_value(spinbutton);
+    if (!win->m_hasVMT || g_blockEventsOnDrag)
+        return;
 
     // note that we don't use wxSpinCtrl::GetValue() here because it would
     // adjust the value to fit into the control range and this means that we
@@ -60,205 +47,237 @@ static void gtk_spinctrl_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win
     // temporarily - and trying to enter 10 into the control which accepts the
     // values in range 5..50 is then, ummm, quite challenging (hint: you can't
     // enter 1!) (VZ)
-    event.SetInt( (int)ceil(win->m_adjust->value) );
-    win->GetEventHandler()->ProcessEvent( event );
+
+    if (wxIsKindOf(win, wxSpinCtrl))
+    {
+        wxSpinEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, win->GetId());
+        event.SetEventObject( win );
+        event.SetPosition((int)(win->m_value + 0.5)); // FIXME should be SetValue
+        event.SetString(GTK_ENTRY(spinbutton)->text);
+        win->HandleWindowEvent( event );
+    }
+    else // wxIsKindOf(win, wxSpinCtrlDouble)
+    {
+        wxSpinDoubleEvent event( wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, win->GetId());
+        event.SetEventObject( win );
+        event.SetValue(win->m_value);
+        event.SetString(GTK_ENTRY(spinbutton)->text);
+        win->HandleWindowEvent( event );
+    }
+}
 }
 
 //-----------------------------------------------------------------------------
 //  "changed"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void
-gtk_spinctrl_text_changed_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win )
+gtk_changed(GtkSpinButton* spinbutton, wxSpinCtrl* win)
 {
-    if (!win->m_hasVMT) return;
-
-    if (g_isIdle)
-        wxapp_install_idle_handler();
+    if (!win->m_hasVMT)
+        return;
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
     event.SetEventObject( win );
-    event.SetInt( win->GetValue() );
-    win->GetEventHandler()->ProcessEvent( event );
+    event.SetString( GTK_ENTRY(spinbutton)->text );
+
+    // see above
+    event.SetInt((int)win->m_value);
+    win->HandleWindowEvent( event );
+}
 }
 
 //-----------------------------------------------------------------------------
-// wxSpinCtrl
+// wxSpinCtrlGTKBase
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlGTKBase, wxSpinCtrlBase)
 
-BEGIN_EVENT_TABLE(wxSpinCtrl, wxControl)
-    EVT_CHAR(wxSpinCtrl::OnChar)
+BEGIN_EVENT_TABLE(wxSpinCtrlGTKBase, wxSpinCtrlBase)
+    EVT_CHAR(wxSpinCtrlGTKBase::OnChar)
 END_EVENT_TABLE()
 
-bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
+bool wxSpinCtrlGTKBase::Create(wxWindow *parent, wxWindowID id,
                         const wxString& value,
                         const wxPoint& pos,  const wxSize& size,
                         long style,
-                        int min, int max, int initial,
+                        double min, double max, double initial, double inc,
                         const wxString& name)
 {
-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
-
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
-        wxFAIL_MSG( wxT("wxSpinCtrl creation failed") );
-        return FALSE;
+        wxFAIL_MSG( wxT("wxSpinCtrlGTKBase creation failed") );
+        return false;
     }
 
-    m_oldPos = initial;
+    m_widget = gtk_spin_button_new_with_range(min, max, inc);
 
-    m_adjust = (GtkAdjustment*) gtk_adjustment_new( initial, min, max, 1.0, 5.0, 0.0);
+    gtk_spin_button_set_value( GTK_SPIN_BUTTON(m_widget), initial);
+    m_value = gtk_spin_button_get_value( GTK_SPIN_BUTTON(m_widget));
 
-    m_widget = gtk_spin_button_new( m_adjust, 1, 0 );
-    
     gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget),
                               (int)(m_windowStyle & wxSP_WRAP) );
 
-    GtkEnableEvents();
-    
-    m_parent->DoAddChild( this );
-
-    PostCreation();
-
-    SetFont( parent->GetFont() );
-    
-    wxSize size_best( DoGetBestSize() );
-    wxSize new_size( size );
-    if (new_size.x == -1)
-        new_size.x = size_best.x;
-    if (new_size.y == -1)
-        new_size.y = size_best.y;
-    if (new_size.y > size_best.y)
-        new_size.y = size_best.y;
-    if ((new_size.x != size.x) || (new_size.y != size.y))
-        SetSize( new_size.x, new_size.y );
+    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);
 
-    SetBackgroundColour( parent->GetBackgroundColour() );
+    m_parent->DoAddChild( this );
 
-    SetValue( value );
+    PostCreation(size);
 
-    Show( TRUE );
+    if (!value.empty())
+    {
+        SetValue(value);
+    }
 
-    return TRUE;
+    return true;
 }
 
-void wxSpinCtrl::GtkDisableEvents()
+double wxSpinCtrlGTKBase::DoGetValue() const
 {
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_adjust),
-                        GTK_SIGNAL_FUNC(gtk_spinctrl_callback),
-                        (gpointer) this );
+    wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
 
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
-                        GTK_SIGNAL_FUNC(gtk_spinctrl_text_changed_callback),
-                        (gpointer) this );
-}
+    GtkDisableEvents();
+    gtk_spin_button_update( GTK_SPIN_BUTTON(m_widget) );
+    wx_const_cast(wxSpinCtrlGTKBase*, this)->m_value =
+        gtk_spin_button_get_value(GTK_SPIN_BUTTON(m_widget));
+    GtkEnableEvents();
 
-void wxSpinCtrl::GtkEnableEvents()
-{
-    gtk_signal_connect( GTK_OBJECT (m_adjust),
-                        "value_changed",
-                        GTK_SIGNAL_FUNC(gtk_spinctrl_callback),
-                        (gpointer) this );
-    
-    gtk_signal_connect( GTK_OBJECT(m_widget),
-                        "changed",
-                        GTK_SIGNAL_FUNC(gtk_spinctrl_text_changed_callback),
-                        (gpointer)this);
+    return m_value;
 }
 
-int wxSpinCtrl::GetMin() const
+double wxSpinCtrlGTKBase::DoGetMin() const
 {
     wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
 
-    return (int)ceil(m_adjust->lower);
+    double min = 0;
+    gtk_spin_button_get_range( GTK_SPIN_BUTTON(m_widget), &min, NULL);
+    return min;
 }
 
-int wxSpinCtrl::GetMax() const
+double wxSpinCtrlGTKBase::DoGetMax() const
 {
     wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
 
-    return (int)ceil(m_adjust->upper);
+    double max = 0;
+    gtk_spin_button_get_range( GTK_SPIN_BUTTON(m_widget), NULL, &max);
+    return max;
 }
 
-int wxSpinCtrl::GetValue() const
+double wxSpinCtrlGTKBase::DoGetIncrement() const
 {
     wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
 
-    gtk_spin_button_update( GTK_SPIN_BUTTON(m_widget) );
+    double inc = 0;
+    gtk_spin_button_get_increments( GTK_SPIN_BUTTON(m_widget), NULL, &inc);
+    return inc;
+}
+
+bool wxSpinCtrlGTKBase::GetSnapToTicks() const
+{
+    wxCHECK_MSG( m_widget, 0, "invalid spin button" );
 
-    return (int)ceil(m_adjust->value);
+    return gtk_spin_button_get_snap_to_ticks( GTK_SPIN_BUTTON(m_widget) );
 }
 
-void wxSpinCtrl::SetValue( const wxString& value )
+void wxSpinCtrlGTKBase::SetValue( const wxString& value )
 {
     wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
 
-    int n;
-    if ( (wxSscanf(value, wxT("%d"), &n) == 1) )
-    {
-        // a number - set it
-        SetValue(n);
-    }
-    else
+    double n;
+    if ( wxSscanf(value, "%lg", &n) == 1 )
     {
-        // invalid number - set text as is (wxMSW compatible)
-        GtkDisableEvents();
-        gtk_entry_set_text( GTK_ENTRY(m_widget), value.mbc_str() );
-        GtkEnableEvents();
+        // a number - set it, let DoSetValue round for int value
+        DoSetValue(n);
+        return;
     }
+
+    // invalid number - set text as is (wxMSW compatible)
+    GtkDisableEvents();
+    gtk_entry_set_text( GTK_ENTRY(m_widget), wxGTK_CONV( value ) );
+    GtkEnableEvents();
 }
 
-void wxSpinCtrl::SetValue( int value )
+void wxSpinCtrlGTKBase::DoSetValue( double value )
 {
     wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
 
-    float fpos = (float)value;
-    m_oldPos = fpos;
-    if (fabs(fpos-m_adjust->value) < sensitivity) return;
-
-    m_adjust->value = fpos;
+    if (wxIsKindOf(this, wxSpinCtrl))
+        value = int(value + 0.5);
 
     GtkDisableEvents();
-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+    gtk_spin_button_set_value( GTK_SPIN_BUTTON(m_widget), value);
+    m_value = gtk_spin_button_get_value( GTK_SPIN_BUTTON(m_widget));
     GtkEnableEvents();
 }
 
-void wxSpinCtrl::SetRange(int minVal, int maxVal)
+void wxSpinCtrlGTKBase::SetSnapToTicks(bool snap_to_ticks)
 {
-    wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
+    wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
 
-    float fmin = (float)minVal;
-    float fmax = (float)maxVal;
+    gtk_spin_button_set_snap_to_ticks( GTK_SPIN_BUTTON(m_widget), snap_to_ticks);
+}
 
-    if ((fabs(fmin-m_adjust->lower) < sensitivity) &&
-        (fabs(fmax-m_adjust->upper) < sensitivity))
+void wxSpinCtrlGTKBase::SetSelection(long from, long to)
+{
+    // translate from wxWidgets conventions to GTK+ ones: (-1, -1) means the
+    // entire range
+    if ( from == -1 && to == -1 )
     {
-        return;
+        from = 0;
+        to = INT_MAX;
     }
 
-    m_adjust->lower = fmin;
-    m_adjust->upper = fmax;
+    gtk_editable_select_region( GTK_EDITABLE(m_widget), (gint)from, (gint)to );
+}
 
-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+void wxSpinCtrlGTKBase::DoSetRange(double minVal, double maxVal)
+{
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
+
+    GtkDisableEvents();
+    gtk_spin_button_set_range( GTK_SPIN_BUTTON(m_widget), minVal, maxVal);
+    m_value = gtk_spin_button_get_value(GTK_SPIN_BUTTON(m_widget));
+    GtkEnableEvents();
+}
+
+void wxSpinCtrlGTKBase::DoSetIncrement(double inc)
+{
+    wxCHECK_RET( m_widget, "invalid spin button" );
+
+    GtkDisableEvents();
+    gtk_spin_button_set_increments( GTK_SPIN_BUTTON(m_widget), inc, 10*inc);
+    m_value = gtk_spin_button_get_value(GTK_SPIN_BUTTON(m_widget));
+    GtkEnableEvents();
+}
+
+void wxSpinCtrlGTKBase::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 wxSpinCtrlGTKBase::GtkEnableEvents() const
+{
+    g_signal_handlers_unblock_by_func(m_widget,
+        (gpointer)gtk_value_changed, (void*) this);
 
-    // these two calls are required due to some bug in GTK
-    Refresh();
-    SetFocus();
+    g_signal_handlers_unblock_by_func(m_widget,
+        (gpointer)gtk_changed, (void*) this);
 }
 
-void wxSpinCtrl::OnChar( wxKeyEvent &event )
+void wxSpinCtrlGTKBase::OnChar( wxKeyEvent &event )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid spin ctrl") );
 
-    if (event.KeyCode() == WXK_RETURN)
+    if (event.GetKeyCode() == WXK_RETURN)
     {
-        wxWindow *top_frame = m_parent;
-        while (top_frame->GetParent() && !(top_frame->GetParent()->IsTopLevel()))
-            top_frame = top_frame->GetParent();
+        wxWindow *top_frame = wxGetTopLevelParent(m_parent);
 
         if ( GTK_IS_WINDOW(top_frame->m_widget) )
         {
@@ -267,7 +286,7 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event )
             {
                 GtkWidget *widgetDef = window->default_widget;
 
-                if ( widgetDef && GTK_IS_WINDOW(widgetDef) )
+                if ( widgetDef )
                 {
                     gtk_widget_activate(widgetDef);
                     return;
@@ -276,25 +295,70 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event )
         }
     }
 
+    if ((event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxTE_PROCESS_ENTER))
+    {
+        wxCommandEvent evt( wxEVT_COMMAND_TEXT_ENTER, m_windowId );
+        evt.SetEventObject(this);
+        GtkSpinButton *gsb = GTK_SPIN_BUTTON(m_widget);
+        wxString val = wxGTK_CONV_BACK( gtk_entry_get_text( &gsb->entry ) );
+        evt.SetString( val );
+        if (HandleWindowEvent(evt)) return;
+    }
+
     event.Skip();
 }
 
-bool wxSpinCtrl::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxSpinCtrlGTKBase::GTKGetWindow(wxArrayGdkWindows& windows) const
 {
-    return GTK_SPIN_BUTTON(m_widget)->panel == window;
+    GtkSpinButton* spinbutton = GTK_SPIN_BUTTON(m_widget);
+
+    windows.push_back(spinbutton->entry.text_area);
+    windows.push_back(spinbutton->panel);
+
+    return NULL;
 }
 
-void wxSpinCtrl::ApplyWidgetStyle()
+wxSize wxSpinCtrlGTKBase::DoGetBestSize() const
 {
-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+    wxSize ret( wxControl::DoGetBestSize() );
+    wxSize best(95, ret.y); // FIXME: 95?
+    CacheBestSize(best);
+    return best;
 }
 
-wxSize wxSpinCtrl::DoGetBestSize() const
+// static
+wxVisualAttributes
+wxSpinCtrlGTKBase::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    wxSize ret( wxControl::DoGetBestSize() );
-    return wxSize(95, ret.y);
+    // TODO: overload to accept functions like gtk_spin_button_new?
+    // Until then use a similar type
+    return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true);
 }
 
-#endif
-   // wxUSE_SPINCTRL
+//-----------------------------------------------------------------------------
+// wxSpinCtrl
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxSpinCtrlGTKBase)
+
+//-----------------------------------------------------------------------------
+// wxSpinCtrlDouble
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlDouble, wxSpinCtrlGTKBase)
+
+unsigned wxSpinCtrlDouble::GetDigits() const
+{
+    wxCHECK_MSG( m_widget, 0, "invalid spin button" );
+
+    return gtk_spin_button_get_digits( GTK_SPIN_BUTTON(m_widget) );
+}
+
+void wxSpinCtrlDouble::SetDigits(unsigned digits)
+{
+    wxCHECK_RET( m_widget, "invalid spin button" );
+
+    gtk_spin_button_set_digits( GTK_SPIN_BUTTON(m_widget), digits);
+}
+
+#endif // wxUSE_SPINCTRL