Modified generic wxTreeCtrl to work under non-Unix platforms simultaneously

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

diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
index e4ef0744ed0a6392a402629b274f8a6eb1b4d705..c3f87369a153c40dddbe2399930fbed7e22b0416 100644 (file)
--- a/src/gtk/spinbutt.cpp
+++ b/src/gtk/spinbutt.cpp
@@ -9,18 +9,20 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "spinbutt.h"
+    #pragma implementation "spinbutt.h"
+    #pragma implementation "spinbutbase.h"

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

-#ifdef wxUSE_SPINBTN
+#if 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
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -35,7 +37,7 @@ extern bool g_isIdle;
 
 extern bool   g_blockEventsOnDrag;
 
 
 extern bool   g_blockEventsOnDrag;
 

-static const float sensitivity = 0.2;
+static const float sensitivity = 0.02;

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


@@ -50,17 +52,13 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
 
     float diff = win->m_adjust->value - win->m_oldPos;
     if (fabs(diff) < sensitivity) 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;
 
     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) < 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;
+    if (fabs(diff-line_step) < sensitivity) command = wxEVT_SCROLL_LINEUP;
+    else if (fabs(diff+line_step) < sensitivity) command = wxEVT_SCROLL_LINEDOWN;

     else command = wxEVT_SCROLL_THUMBTRACK;
 
     int value = (int)ceil(win->m_adjust->value);
     else command = wxEVT_SCROLL_THUMBTRACK;
 
     int value = (int)ceil(win->m_adjust->value);


@@ -69,7 +67,36 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
     event.SetPosition( value );
     event.SetEventObject( win );
 
     event.SetPosition( value );
     event.SetEventObject( win );
 

-    win->GetEventHandler()->ProcessEvent( event );
+    if ((win->GetEventHandler()->ProcessEvent( event )) &&
+        !event.IsAllowed() )
+    {
+        /* program has vetoed */
+        win->m_adjust->value = win->m_oldPos;
+        
+        gtk_signal_disconnect_by_func( GTK_OBJECT (win->m_adjust),
+                        (GtkSignalFunc) gtk_spinbutt_callback,
+                        (gpointer) win );
+        
+        gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
+
+        gtk_signal_connect( GTK_OBJECT (win->m_adjust),
+                        "value_changed",
+                        (GtkSignalFunc) gtk_spinbutt_callback,
+                        (gpointer) win );
+        return;
+    }
+    
+    win->m_oldPos = win->m_adjust->value;
+    
+    /* 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 );
+    }

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


@@ -77,7 +104,7 @@ 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);
+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)

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


@@ -92,16 +119,17 @@ bool wxSpinButton::Create(wxWindow *parent,
 {
     m_needParent = TRUE;
 
 {
     m_needParent = TRUE;
 

-    wxSize new_size = size;
-    new_size.x = 15;
+    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;
+        new_size.y = sizeBest.y;

 
     if (!PreCreation( parent, pos, new_size ) ||
         !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
     {
 
     if (!PreCreation( parent, pos, new_size ) ||
         !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
     {

-        wxFAIL_MSG( _T("wxXX creation failed") );
-       return FALSE;
+        wxFAIL_MSG( wxT("wxXX creation failed") );
+           return FALSE;

     }
 
     m_oldPos = 0.0;
     }
 
     m_oldPos = 0.0;


@@ -110,7 +138,8 @@ bool wxSpinButton::Create(wxWindow *parent,
 
     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_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget),
+                              (int)(m_windowStyle & wxSP_WRAP) );

 
     gtk_signal_connect( GTK_OBJECT (m_adjust),
                         "value_changed",
 
     gtk_signal_connect( GTK_OBJECT (m_adjust),
                         "value_changed",


@@ -128,34 +157,30 @@ bool wxSpinButton::Create(wxWindow *parent,
     return TRUE;
 }
 
     return TRUE;
 }
 

-wxSpinButton::~wxSpinButton()
-{
-}
-

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

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

 
     return (int)ceil(m_adjust->lower);
 }
 
 int wxSpinButton::GetMax() const
 {
 
     return (int)ceil(m_adjust->lower);
 }
 
 int wxSpinButton::GetMax() const
 {

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

 
     return (int)ceil(m_adjust->upper);
 }
 
 int wxSpinButton::GetValue() const
 {
 
     return (int)ceil(m_adjust->upper);
 }
 
 int wxSpinButton::GetValue() const
 {

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

 
     return (int)ceil(m_adjust->value);
 }
 
 void wxSpinButton::SetValue( int value )
 {
 
     return (int)ceil(m_adjust->value);
 }
 
 void wxSpinButton::SetValue( int value )
 {

-    wxCHECK_RET( (m_widget != NULL), _T("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;


@@ -168,7 +193,7 @@ void wxSpinButton::SetValue( int value )
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {

-    wxCHECK_RET( (m_widget != NULL), _T("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;


@@ -183,13 +208,17 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
     m_adjust->upper = fmax;
 
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
     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), _T("invalid spin button") );
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );

 
 

-    m_width = 15;
+    m_width = DoGetBestSize().x;

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


@@ -204,4 +233,9 @@ void wxSpinButton::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 

+wxSize wxSpinButton::DoGetBestSize() const
+{
+    return wxSize(15, 26);
+}
+

 #endif
 #endif