VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

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

diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
index 1198df9597a402bc00ffa23adda312eba52b5b93..58e83b7df77025663bbe7a7e70f498fe97c3efa3 100644 (file)
--- a/src/gtk/spinbutt.cpp
+++ b/src/gtk/spinbutt.cpp
@@ -35,7 +35,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"


@@ -55,22 +55,27 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
     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;
 
     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;

     else command = wxEVT_SCROLL_THUMBTRACK;
 
     int value = (int)ceil(win->m_adjust->value);
 
     wxSpinEvent event( command, win->GetId());
     event.SetPosition( value );
     else command = wxEVT_SCROLL_THUMBTRACK;
 
     int value = (int)ceil(win->m_adjust->value);
 
     wxSpinEvent event( command, win->GetId());
     event.SetPosition( value );

-    event.SetOrientation( wxVERTICAL );

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

-

     win->GetEventHandler()->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 );
+    }

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


@@ -96,12 +101,12 @@ bool wxSpinButton::Create(wxWindow *parent,
     wxSize new_size = size;
     new_size.x = 15;
     if (new_size.y == -1)
     wxSize new_size = size;
     new_size.x = 15;
     if (new_size.y == -1)

-        new_size.y = 30;
+        new_size.y = 26;

 
     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") );
+        wxFAIL_MSG( wxT("wxXX creation failed") );

        return FALSE;
     }
 
        return FALSE;
     }
 


@@ -111,7 +116,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",


@@ -129,34 +135,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;


@@ -169,7 +171,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;


@@ -184,11 +186,15 @@ 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;
     gtk_widget_set_usize( m_widget, m_width, m_height );
 
     m_width = 15;
     gtk_widget_set_usize( m_widget, m_width, m_height );