corrected off by 1 error in cMB2WC() call (thanks valgrind)

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

diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index f4458a75848e6a082078cee1eb60350ba8e921c5..d14e452c6cc495d39c0733f20d0a0995c592c6a8 100644 (file)
--- 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:
 // Purpose:     wxSpinCtrl
 // Author:      Robert
 // Modified by:


@@ -8,29 +8,20 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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
 
 
 #if wxUSE_SPINCTRL
 

-#include "wx/utils.h"
-
-#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
 
 //-----------------------------------------------------------------------------
 // data


@@ -42,12 +33,13 @@ extern bool   g_blockEventsOnDrag;
 // "value_changed"
 //-----------------------------------------------------------------------------
 
 // "value_changed"
 //-----------------------------------------------------------------------------
 

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

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!win->m_hasVMT) return;
-    if (g_blockEventsOnDrag) return;
+    win->m_pos = int(gtk_spin_button_get_value(spinbutton));
+    if (!win->m_hasVMT || g_blockEventsOnDrag || win->m_blockScrollEvent)
+        return;

 
     wxCommandEvent event( wxEVT_COMMAND_SPINCTRL_UPDATED, win->GetId());
     event.SetEventObject( win );
 
     wxCommandEvent event( wxEVT_COMMAND_SPINCTRL_UPDATED, win->GetId());
     event.SetEventObject( win );


@@ -58,27 +50,31 @@ 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)
     // 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) );
+    event.SetInt(win->m_pos);

     win->GetEventHandler()->ProcessEvent( event );
 }
     win->GetEventHandler()->ProcessEvent( event );
 }

+}

 
 //-----------------------------------------------------------------------------
 //  "changed"
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 //  "changed"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void
 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 || win->m_blockScrollEvent)
+        return;

 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
     event.SetEventObject( win );
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
     event.SetEventObject( win );

-    event.SetInt( win->GetValue() );
+    event.SetString( GTK_ENTRY(spinbutton)->text );
+
+    // see above
+    event.SetInt(win->m_pos);

     win->GetEventHandler()->ProcessEvent( event );
 }
     win->GetEventHandler()->ProcessEvent( event );
 }

+}

 
 //-----------------------------------------------------------------------------
 // wxSpinCtrl
 
 //-----------------------------------------------------------------------------
 // wxSpinCtrl


@@ -90,6 +86,11 @@ BEGIN_EVENT_TABLE(wxSpinCtrl, wxControl)
     EVT_CHAR(wxSpinCtrl::OnChar)
 END_EVENT_TABLE()
 
     EVT_CHAR(wxSpinCtrl::OnChar)
 END_EVENT_TABLE()
 

+wxSpinCtrl::wxSpinCtrl()
+{
+    m_pos = 0;
+}
+

 bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
                         const wxString& value,
                         const wxPoint& pos,  const wxSize& size,
 bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
                         const wxString& value,
                         const wxPoint& pos,  const wxSize& size,


@@ -97,98 +98,62 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
                         int min, int max, int initial,
                         const wxString& name)
 {
                         int min, int max, int initial,
                         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") );
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxSpinCtrl creation failed") );

-        return FALSE;
+        return false;

     }
 
     }
 

-    m_oldPos = initial;
-
-    m_adjust = (GtkAdjustment*) gtk_adjustment_new( initial, min, max, 1.0, 5.0, 0.0);
+    m_widget = gtk_spin_button_new_with_range(min, max, 1);
+    gtk_spin_button_set_value((GtkSpinButton*)m_widget, initial);
+    m_pos = int(gtk_spin_button_get_value((GtkSpinButton*)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) );
 
     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 );
-
-    SetBackgroundColour( parent->GetBackgroundColour() );
-
-    SetValue( value );
+    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);

 
 

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

 
 

-void wxSpinCtrl::GtkDisableEvents()
-{
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_adjust),
-                        GTK_SIGNAL_FUNC(gtk_spinctrl_callback),
-                        (gpointer) this );
+    PostCreation(size);

 
 

-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
-                        GTK_SIGNAL_FUNC(gtk_spinctrl_text_changed_callback),
-                        (gpointer) this );
-}
+    if (!value.empty())
+    {
+        SetValue(value);
+    }

 
 

-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 true;

 }
 
 int wxSpinCtrl::GetMin() const
 {
     wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
 
 }
 
 int wxSpinCtrl::GetMin() const
 {
     wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
 

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

 }
 
 int wxSpinCtrl::GetMax() const
 {
     wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
 
 }
 
 int wxSpinCtrl::GetMax() const
 {
     wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
 

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

 }
 
 int wxSpinCtrl::GetValue() const
 {
     wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
 
 }
 
 int wxSpinCtrl::GetValue() const
 {
     wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
 

+    GtkDisableEvents();

     gtk_spin_button_update( GTK_SPIN_BUTTON(m_widget) );
     gtk_spin_button_update( GTK_SPIN_BUTTON(m_widget) );

+    GtkEnableEvents();

 
 

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

 }
 
 void wxSpinCtrl::SetValue( const wxString& value )
 }
 
 void wxSpinCtrl::SetValue( const wxString& value )


@@ -205,7 +170,7 @@ void wxSpinCtrl::SetValue( const wxString& value )
     {
         // invalid number - set text as is (wxMSW compatible)
         GtkDisableEvents();
     {
         // invalid number - set text as is (wxMSW compatible)
         GtkDisableEvents();

-        gtk_entry_set_text( GTK_ENTRY(m_widget), value.mbc_str() );
+        gtk_entry_set_text( GTK_ENTRY(m_widget), wxGTK_CONV( value ) );

         GtkEnableEvents();
     }
 }
         GtkEnableEvents();
     }
 }


@@ -214,76 +179,114 @@ void wxSpinCtrl::SetValue( int value )
 {
     wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
 
 {
     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;
-

     GtkDisableEvents();
     GtkDisableEvents();

-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+    gtk_spin_button_set_value((GtkSpinButton*)m_widget, value);

     GtkEnableEvents();
 }
 
     GtkEnableEvents();
 }
 

+void wxSpinCtrl::SetSelection(long from, long to)
+{
+    // translate from wxWidgets conventions to GTK+ ones: (-1, -1) means the
+    // entire range
+    if ( from == -1 && to == -1 )
+    {
+        from = 0;
+        to = INT_MAX;
+    }
+
+    gtk_editable_select_region( GTK_EDITABLE(m_widget), (gint)from, (gint)to );
+}
+

 void wxSpinCtrl::SetRange(int minVal, int maxVal)
 {
     wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
 
 void wxSpinCtrl::SetRange(int minVal, int maxVal)
 {
     wxCHECK_RET( (m_widget != NULL), wxT("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;
-    }
+    GtkDisableEvents();
+    gtk_spin_button_set_range((GtkSpinButton*)m_widget, minVal, maxVal);
+    GtkEnableEvents();
+}

 
 

-    m_adjust->lower = fmin;
-    m_adjust->upper = fmax;

 
 

-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+void wxSpinCtrl::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);
+}

 
 

-    // these two calls are required due to some bug in GTK
-    Refresh();
-    SetFocus();
+void wxSpinCtrl::GtkEnableEvents() const
+{
+    g_signal_handlers_unblock_by_func(m_widget,
+        (gpointer)gtk_value_changed, (void*) this);
+        
+    g_signal_handlers_unblock_by_func(m_widget,
+        (gpointer)gtk_changed, (void*) this);

 }
 
 void wxSpinCtrl::OnChar( wxKeyEvent &event )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid spin ctrl") );
 
 }
 
 void wxSpinCtrl::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();
-        GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
+        wxWindow *top_frame = wxGetTopLevelParent(m_parent);

 
 

-        if (window->default_widget)
+        if ( GTK_IS_WINDOW(top_frame->m_widget) )

         {
         {

-            gtk_widget_activate (window->default_widget);
-            return;
+            GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
+            if ( window )
+            {
+                GtkWidget *widgetDef = window->default_widget;
+
+                if ( widgetDef )
+                {
+                    gtk_widget_activate(widgetDef);
+                    return;
+                }
+            }

         }
     }
 
         }
     }
 

+    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 (GetEventHandler()->ProcessEvent(evt)) return;
+    }
+

     event.Skip();
 }
 
     event.Skip();
 }
 

-bool wxSpinCtrl::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxSpinCtrl::GTKGetWindow(wxArrayGdkWindows& windows) const

 {
 {

-    return GTK_SPIN_BUTTON(m_widget)->panel == window;
-}
+    GtkSpinButton* spinbutton = GTK_SPIN_BUTTON(m_widget);

 
 

-void wxSpinCtrl::ApplyWidgetStyle()
-{
-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+    windows.push_back(spinbutton->entry.text_area);
+    windows.push_back(spinbutton->panel);
+
+    return NULL;

 }
 
 wxSize wxSpinCtrl::DoGetBestSize() const
 {
     wxSize ret( wxControl::DoGetBestSize() );
 }
 
 wxSize wxSpinCtrl::DoGetBestSize() const
 {
     wxSize ret( wxControl::DoGetBestSize() );

-    return wxSize(95, ret.y);
+    wxSize best(95, ret.y); // FIXME: 95?
+    CacheBestSize(best);
+    return best;
+}
+
+// static
+wxVisualAttributes
+wxSpinCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    // TODO: overload to accept functions like gtk_spin_button_new?
+    // Until then use a similar type
+    return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true);

 }
 
 #endif
 }
 
 #endif