added test mode to wxLongLongWx which allowed to find the bug in operator*=()

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

diff --git a/src/gtk1/spinbutt.cpp b/src/gtk1/spinbutt.cpp
index dfe03b27a187b7f264f978730c7c448208974359..2ecf6885e41b4af0baae4cb12dfe089c04e201f1 100644 (file)
--- a/src/gtk1/spinbutt.cpp
+++ b/src/gtk1/spinbutt.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -13,11 +13,22 @@
 #endif
 
 #include "wx/spinbutt.h"
 #endif
 
 #include "wx/spinbutt.h"

+
+#ifdef wxUSE_SPINBTN
+

 #include "wx/utils.h"
 #include "wx/utils.h"

+

 #include <math.h>
 
 #include <math.h>
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;

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


@@ -25,37 +36,47 @@
 
 extern bool   g_blockEventsOnDrag;
 
 
 extern bool   g_blockEventsOnDrag;
 

+static const float sensitivity = 0.02;
+

 //-----------------------------------------------------------------------------
 // "value_changed"
 //-----------------------------------------------------------------------------
 
 static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *win )
 //-----------------------------------------------------------------------------
 // "value_changed"
 //-----------------------------------------------------------------------------
 
 static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *win )

-{ 
-    if (!win->HasVMT()) return;
+{
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (!win->m_hasVMT) return;

     if (g_blockEventsOnDrag) return;
     if (g_blockEventsOnDrag) return;

-  
+

     float diff = win->m_adjust->value - win->m_oldPos;
     float diff = win->m_adjust->value - win->m_oldPos;

-    if (fabs(diff) < 0.2) return;
-  
+    if (fabs(diff) < sensitivity) return;
+    win->m_oldPos = win->m_adjust->value;
+

     wxEventType command = wxEVT_NULL;
     wxEventType command = wxEVT_NULL;

-  
+

     float line_step = win->m_adjust->step_increment;
     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;
+
+    if (fabs(diff-line_step) < sensitivity) command = wxEVT_SCROLL_LINEDOWN;
+    else if (fabs(diff+line_step) < sensitivity) command = wxEVT_SCROLL_LINEUP;

     else command = wxEVT_SCROLL_THUMBTRACK;
 
     else command = wxEVT_SCROLL_THUMBTRACK;
 

-    int value = (int)(win->m_adjust->value+0.5);
-      
+    int value = (int)ceil(win->m_adjust->value);
+

     wxSpinEvent event( command, win->GetId());
     event.SetPosition( value );
     wxSpinEvent event( command, win->GetId());
     event.SetPosition( value );

-    event.SetOrientation( wxVERTICAL );

     event.SetEventObject( win );
     event.SetEventObject( win );

-  
-    win->ProcessEvent( event );
+    win->GetEventHandler()->ProcessEvent( event );
+    
+    /* always send a thumbtrack event */
+    if (command != wxEVT_SCROLL_THUMBTRACK)
+    {
+        command = wxEVT_SCROLL_THUMBTRACK;
+        wxSpinEvent event2( command, win->GetId());
+        event2.SetPosition( value );
+        event2.SetEventObject( win );
+        win->GetEventHandler()->ProcessEvent( event2 );
+    }

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -63,116 +84,121 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinButton,wxControl)
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinButton,wxControl)

+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);

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

-wxSpinButton::wxSpinButton()
-{
-}
-
-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;
 {
     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 );
+
+    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("wxXX creation failed") );
+       return FALSE;
+    }

 
     m_oldPos = 0.0;
 
     m_adjust = (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 100.0, 1.0, 5.0, 0.0);
 
     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 );
     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), 
+
+    gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget),
+                              (int)(m_windowStyle & wxSP_WRAP) );
+
+    gtk_signal_connect( GTK_OBJECT (m_adjust),

                         "value_changed",
                         "value_changed",

-                       (GtkSignalFunc) gtk_spinbutt_callback, 
-                       (gpointer) this );
-  
-    m_parent->AddChild( this );
+                        (GtkSignalFunc) gtk_spinbutt_callback,
+                        (gpointer) this );
+
+    m_parent->DoAddChild( this );

 
 

-    (m_parent->m_insertCallback)( m_parent, this );
-  

     PostCreation();
     PostCreation();

-  
+

     SetBackgroundColour( parent->GetBackgroundColour() );
 
     Show( TRUE );
     SetBackgroundColour( parent->GetBackgroundColour() );
 
     Show( TRUE );

-    
-    return TRUE;
-}

 
 

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

 }
 
 int wxSpinButton::GetMin() const
 {
 }
 
 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") );
+
+    return (int)ceil(m_adjust->lower);

 }
 
 int wxSpinButton::GetMax() const
 {
 }
 
 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") );
+
+    return (int)ceil(m_adjust->upper);

 }
 
 int wxSpinButton::GetValue() const
 {
 }
 
 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 (int)ceil(m_adjust->value);

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

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

     float fpos = (float)value;
     m_oldPos = fpos;
     float fpos = (float)value;
     m_oldPos = fpos;

-    if (fabs(fpos-m_adjust->value) < 0.2) return;
-    
+    if (fabs(fpos-m_adjust->value) < sensitivity) return;
+

     m_adjust->value = fpos;
     m_adjust->value = fpos;

-  
+

     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {

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

     float fmin = (float)minVal;
     float fmax = (float)maxVal;
     float fmin = (float)minVal;
     float fmax = (float)maxVal;

-      
-    if ((fabs(fmin-m_adjust->lower) < 0.2) &&
-        (fabs(fmax-m_adjust->upper) < 0.2))
+
+    if ((fabs(fmin-m_adjust->lower) < sensitivity) &&
+        (fabs(fmax-m_adjust->upper) < sensitivity))

     {
         return;
     }
     {
         return;
     }

-      
+

     m_adjust->lower = fmin;
     m_adjust->upper = fmax;
 
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
     m_adjust->lower = fmin;
     m_adjust->upper = fmax;
 
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );

+    
+    // these two calls are required due to some bug in GTK
+    Refresh();
+    SetFocus();

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

-    wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
-  
-    m_width = 16;
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
+
+    m_width = DoGetBestSize().x;

     gtk_widget_set_usize( m_widget, m_width, m_height );
 }
 
     gtk_widget_set_usize( m_widget, m_width, m_height );
 }
 


@@ -187,15 +213,9 @@ void wxSpinButton::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 

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

 {
 {

+    return wxSize(15, 26);

 }
 
 }
 

-
+#endif