X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e18907799c4b338607b4d57861f97266431b01d..a1b3b608321536701498310287bfd0c46010ff5a:/src/gtk/spinbutt.cpp

diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
index 83eb28ec50..6dbfe5b107 100644
--- a/src/gtk/spinbutt.cpp
+++ b/src/gtk/spinbutt.cpp
@@ -1,19 +1,25 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        spinbutt.cpp
+// Name:        src/gtk/spinbutt.cpp
 // Purpose:     wxSpinButton
 // Author:      Robert
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// 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/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+
+#include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------
 // data
@@ -25,33 +31,43 @@ extern bool   g_blockEventsOnDrag;
 // "value_changed"
 //-----------------------------------------------------------------------------
 
-static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *win )
-{ 
-  if (!win->HasVMT()) return;
-  if (g_blockEventsOnDrag) return;
-  
-  float diff = win->m_adjust->value - win->m_oldPos;
-  if (fabs(diff) < 0.2) return;
-  
-  wxEventType command = wxEVT_NULL;
-  
-  float line_step = win->m_adjust->step_increment;
-  float page_step = win->m_adjust->page_increment;
-  
-  if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLL_LINEDOWN;
-  else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP;
-  else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN;
-  else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
-  else command = wxEVT_SCROLL_THUMBTRACK;
-
-  int value = (int)(win->m_adjust->value+0.5);
-      
-  wxSpinEvent event( command, win->GetId());
-  event.SetPosition( value );
-  event.SetOrientation( wxVERTICAL );
-  event.SetEventObject( win );
-  
-  win->ProcessEvent( event );
+extern "C" {
+static void
+gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win)
+{
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    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 || win->m_blockScrollEvent || pos == oldPos)
+    {
+        win->m_pos = pos;
+        return;
+    }
+
+    wxSpinEvent event(pos > oldPos ? wxEVT_SCROLL_LINEUP : wxEVT_SCROLL_LINEDOWN, win->GetId());
+    event.SetPosition(pos);
+    event.SetEventObject(win);
+
+    if ((win->GetEventHandler()->ProcessEvent( event )) &&
+        !event.IsAllowed() )
+    {
+        /* program has vetoed */
+        win->BlockScrollEvent();
+        gtk_spin_button_set_value(spinbutton, oldPos);
+        win->UnblockScrollEvent();
+        return;
+    }
+
+    win->m_pos = pos;
+
+    /* always send a thumbtrack event */
+    wxSpinEvent event2(wxEVT_SCROLL_THUMBTRACK, win->GetId());
+    event2.SetPosition(pos);
+    event2.SetEventObject(win);
+    win->GetEventHandler()->ProcessEvent(event2);
+}
 }
 
 //-----------------------------------------------------------------------------
@@ -59,6 +75,7 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinButton,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
 
 BEGIN_EVENT_TABLE(wxSpinButton, wxControl)
     EVT_SIZE(wxSpinButton::OnSize)
@@ -66,127 +83,118 @@ 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;
-  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) );
-	
-  gtk_signal_connect (GTK_OBJECT (m_adjust), "value_changed",
-		      (GtkSignalFunc) gtk_spinbutt_callback, (gpointer) this );
-  
-  m_parent->AddChild( this );
-
-  (m_parent->m_insertCallback)( m_parent, this );
-  
-  PostCreation();
-  
-  SetBackgroundColour( parent->GetBackgroundColour() );
-
-  Show( TRUE );
-    
-  return TRUE;
-}
+    m_needParent = true;
 
-wxSpinButton::~wxSpinButton()
-{
+    wxSize new_size = size,
+           sizeBest = DoGetBestSize();
+    new_size.x = sizeBest.x;            // override width always
+    if (new_size.y == -1)
+        new_size.y = sizeBest.y;
+
+    if (!PreCreation( parent, pos, new_size ) ||
+        !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxSpinButton creation failed") );
+        return false;
+    }
+
+    m_pos = 0;
+
+    m_widget = gtk_spin_button_new_with_range(0, 100, 1);
+
+    gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget),
+                              (int)(m_windowStyle & wxSP_WRAP) );
+
+    g_signal_connect_after(
+        m_widget, "value_changed", G_CALLBACK(gtk_value_changed), this);
+
+    m_parent->DoAddChild( this );
+
+    PostCreation(new_size);
+
+    return true;
 }
 
 int wxSpinButton::GetMin() const
 {
-  wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
-  
-  return (int)(m_adjust->lower+0.5);
+    wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
+
+    double min;
+    gtk_spin_button_get_range((GtkSpinButton*)m_widget, &min, NULL);
+    return int(min);
 }
 
 int wxSpinButton::GetMax() const
 {
-  wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
-  
-  return (int)(m_adjust->upper+0.5);
+    wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
+
+    double max;
+    gtk_spin_button_get_range((GtkSpinButton*)m_widget, NULL, &max);
+    return int(max);
 }
 
 int wxSpinButton::GetValue() const
 {
-  wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
-  
-  return (int)(m_adjust->value+0.5);
+    wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
+
+    return m_pos;
 }
 
 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) < 0.2) return;
-  m_adjust->value = fpos;
-  
-  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
+
+    BlockScrollEvent();
+    gtk_spin_button_set_value((GtkSpinButton*)m_widget, value);
+    UnblockScrollEvent();
 }
 
 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) < 0.2) &&
-      (fabs(fmax-m_adjust->upper) < 0.2))
-      return;
-      
-  m_adjust->lower = fmin;
-  m_adjust->upper = fmax;
-
-  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
+
+    BlockScrollEvent();
+    gtk_spin_button_set_range((GtkSpinButton*)m_widget, minVal, maxVal);
+    UnblockScrollEvent();
 }
 
 void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
-  wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
-  
-  m_width = 16;
-  gtk_widget_set_usize( m_widget, m_width, m_height );
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
+
+    m_width = DoGetBestSize().x;
+    gtk_widget_set_size_request( m_widget, m_width, m_height );
 }
 
 bool wxSpinButton::IsOwnGtkWindow( GdkWindow *window )
 {
-  return GTK_SPIN_BUTTON(m_widget)->panel == window;
+    return GTK_SPIN_BUTTON(m_widget)->panel == window;
 }
 
-void wxSpinButton::ApplyWidgetStyle()
+wxSize wxSpinButton::DoGetBestSize() const
 {
-  SetWidgetStyle();
-  gtk_widget_set_style( m_widget, m_widgetStyle );
+    wxSize best(15, 26); // FIXME
+    CacheBestSize(best);
+    return best;
 }
 
-//-----------------------------------------------------------------------------
-// wxSpinEvent
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
-
-wxSpinEvent::wxSpinEvent(wxEventType commandType, int id):
-  wxScrollEvent(commandType, id)
+// 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