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

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

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index b2f0bccefc943a4d70b29db19fc091a39566ee89..996c428eaa95442883557e4b8412fcb97665e419 100644 (file)
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -38,39 +38,36 @@ extern bool   g_blockEventsOnDrag;
 // "value_changed"
 //-----------------------------------------------------------------------------
 
-static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
-{ 
+static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win )
+{
     if (g_isIdle) wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
-    
-    float diff = win->m_adjust->value - win->m_oldPos;
+
+    float diff = adjust->value - win->m_oldPos;
     if (fabs(diff) < 0.2) return;
-    win->m_oldPos = win->m_adjust->value;
-  
-    wxEventType command = wxEVT_NULL;
-  
-    float line_step = win->m_adjust->step_increment;
-    float page_step = win->m_adjust->page_increment;
-  
-    if (fabs(win->m_adjust->value-win->m_adjust->lower) < 0.2) command = wxEVT_SCROLL_BOTTOM;
-    else if (fabs(win->m_adjust->value-win->m_adjust->upper) < 0.2) command = wxEVT_SCROLL_TOP;
-    else 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)ceil(win->m_adjust->value);
-      
+
+    win->m_oldPos = adjust->value;
+
+    GtkRange *range = GTK_RANGE( win->m_widget );
+
+    wxEventType command = wxEVT_SCROLL_THUMBTRACK;
+    if      (range->scroll_type == GTK_SCROLL_STEP_BACKWARD) command = wxEVT_SCROLL_LINEUP;
+    else if (range->scroll_type == GTK_SCROLL_STEP_FORWARD)  command = wxEVT_SCROLL_LINEDOWN;
+    else if (range->scroll_type == GTK_SCROLL_PAGE_BACKWARD) command = wxEVT_SCROLL_PAGEUP;
+    else if (range->scroll_type == GTK_SCROLL_PAGE_FORWARD)  command = wxEVT_SCROLL_PAGEDOWN;
+
+    int value = (int)ceil(adjust->value);
+
     int orient = wxHORIZONTAL;
-    if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;
-  
+    if ( (win->GetWindowStyleFlag() & wxSB_VERTICAL) == wxSB_VERTICAL)
+        orient = wxVERTICAL;
+
     wxScrollEvent event( command, win->GetId(), value, orient );
     event.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent( event );
-  
+
     wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
     cevent.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent( cevent );
@@ -97,12 +94,13 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 {
     m_acceptsFocus = TRUE;
     m_needParent = TRUE;
-  
-    PreCreation( parent, id, pos, size, style, name );
-  
-#if wxUSE_VALIDATORS
-    SetValidator( validator );
-#endif
+
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxSlider creation failed") );
+       return FALSE;
+    }
 
     m_oldPos = 0.0;
 
@@ -110,11 +108,12 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         m_widget = gtk_vscale_new( (GtkAdjustment *) NULL );
     else
         m_widget = gtk_hscale_new( (GtkAdjustment *) NULL );
-    
+
     if (style & wxSL_LABELS)
     {
         gtk_scale_set_draw_value( GTK_SCALE( m_widget ), TRUE );
-        
+       gtk_scale_set_digits( GTK_SCALE( m_widget ), 0 );
+
         /* labels need more space and too small window will
            cause junk to appear on the dialog */
         if (style & wxSL_VERTICAL)
@@ -140,23 +139,23 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         gtk_scale_set_draw_value( GTK_SCALE( m_widget ), FALSE );
 
     m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
-  
-    gtk_signal_connect( GTK_OBJECT(m_adjust), 
+
+    gtk_signal_connect( GTK_OBJECT(m_adjust),
                         "value_changed",
-                        (GtkSignalFunc) gtk_slider_callback, 
+                        (GtkSignalFunc) gtk_slider_callback,
                         (gpointer) this );
-        
+
     SetRange( minValue, maxValue );
     SetValue( value );
-  
+
     m_parent->DoAddChild( this );
-  
+
     PostCreation();
-  
+
     SetBackgroundColour( parent->GetBackgroundColour() );
 
     Show( TRUE );
-    
+
     return TRUE;
 }
 
@@ -170,9 +169,9 @@ void wxSlider::SetValue( int value )
     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" );
 }
 
@@ -180,13 +179,13 @@ void wxSlider::SetRange( int minValue, int maxValue )
 {
     float fmin = (float)minValue;
     float fmax = (float)maxValue;
-      
+
     if ((fabs(fmin-m_adjust->lower) < 0.2) &&
         (fabs(fmax-m_adjust->upper) < 0.2))
     {
         return;
     }
-      
+
     m_adjust->lower = fmin;
     m_adjust->upper = fmax;
 
@@ -206,9 +205,9 @@ int wxSlider::GetMax(void) const
 void wxSlider::SetPageSize( int pageSize )
 {
     float fpage = (float)pageSize;
-      
+
     if (fabs(fpage-m_adjust->page_increment) < 0.2) return;
-      
+
     m_adjust->page_increment = fpage;
 
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
@@ -222,9 +221,9 @@ int wxSlider::GetPageSize(void) const
 void wxSlider::SetThumbLength( int len )
 {
     float flen = (float)len;
-      
+
     if (fabs(flen-m_adjust->page_size) < 0.2) return;
-      
+
     m_adjust->page_size = flen;
 
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );