]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk1/slider.cpp
ShouldAccountFor was a 2.8 only change. Use IsShown instead.
[wxWidgets.git] / src / gtk1 / slider.cpp
index bdbc509ceb0e0ee9f61614f1b1417b265b06188c..f704d408170fd600286c4482404cc88b02d16a44 100644 (file)
@@ -1,25 +1,25 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        slider.cpp
+// Name:        src/gtk1/slider.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:           wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "slider.h"
-#endif
-
-#include "wx/slider.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #if wxUSE_SLIDER
 
-#include "wx/utils.h"
-#include <math.h>
+#include "wx/slider.h"
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/math.h"
+#endif
+
+#include "wx/gtk1/private.h"
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -32,73 +32,114 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
-extern bool   g_blockEventsOnDrag;
+extern bool g_blockEventsOnDrag;
 
-//-----------------------------------------------------------------------------
-// "value_changed"
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// helper functions
+// ----------------------------------------------------------------------------
 
-static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win )
-{ 
-    if (g_isIdle) wxapp_install_idle_handler();
+// compare 2 adjustment values up to some (hardcoded) precision
+static inline bool AreSameAdjustValues(double x, double y)
+{
+    return fabs(x - y) < 0.02;
+}
 
-    if (!win->m_hasVMT) return;
-    if (g_blockEventsOnDrag) return;
+// process a scroll event
+static void
+ProcessScrollEvent(wxSlider *win, wxEventType evtType, double dvalue)
+{
+    int orient = win->GetWindowStyleFlag() & wxSL_VERTICAL ? wxVERTICAL
+                                                           : wxHORIZONTAL;
 
-    float diff = adjust->value - win->m_oldPos;
-    if (fabs(diff) < 0.2) return;
-    
-    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;
-  
-    wxScrollEvent event( command, win->GetId(), value, orient );
+    int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);
+    wxScrollEvent event( evtType, win->GetId(), value, orient );
     event.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent( event );
-  
+    win->HandleWindowEvent( event );
+
+    if ( evtType != wxEVT_SCROLL_THUMBTRACK )
+    {
+        wxScrollEvent event2(wxEVT_SCROLL_CHANGED, win->GetId(), value, orient);
+        event2.SetEventObject( win );
+        win->HandleWindowEvent( event2 );
+    }
+
     wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
     cevent.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent( cevent );
+    cevent.SetInt( value );
+    win->HandleWindowEvent( cevent );
 }
 
 //-----------------------------------------------------------------------------
-// wxSlider
+// "value_changed"
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
+extern "C" {
+static void gtk_slider_callback( GtkAdjustment *adjust,
+                                 SCROLLBAR_CBACK_ARG
+                                 wxSlider *win )
+{
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (!win->m_hasVMT) return;
+    if (g_blockEventsOnDrag) return;
+
+    const double dvalue = adjust->value;
+    const double diff = dvalue - win->m_oldPos;
+    if ( AreSameAdjustValues(diff, 0) )
+        return;
 
-wxSlider::wxSlider(void)
+    wxEventType evtType;
+    evtType = GtkScrollTypeToWx(GET_SCROLL_TYPE(win->m_widget));
+
+    ProcessScrollEvent(win, evtType, dvalue);
+
+    win->m_oldPos = dvalue;
+}
+
+static gint gtk_slider_button_press_callback( GtkWidget * /* widget */,
+                                              GdkEventButton * /* gdk_event */,
+                                              wxWindowGTK *win)
 {
+    // indicate that the thumb is being dragged with the mouse
+    win->m_isScrolling = true;
+
+    return FALSE;
 }
 
-wxSlider::~wxSlider(void)
+static gint gtk_slider_button_release_callback( GtkWidget *scale,
+                                                GdkEventButton * /* gdk_event */,
+                                                wxSlider *win)
 {
+    // not scrolling any longer
+    win->m_isScrolling = false;
+
+    ProcessScrollEvent(win, wxEVT_SCROLL_THUMBRELEASE,
+                       GTK_RANGE(scale)->adjustment->value);
+
+    return FALSE;
+}
+
 }
 
+//-----------------------------------------------------------------------------
+// wxSlider
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
+
 bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         int value, int minValue, int maxValue,
         const wxPoint& pos, const wxSize& size,
         long style, const wxValidator& validator, const wxString& name )
 {
-    m_acceptsFocus = TRUE;
-    m_needParent = TRUE;
-  
+    m_acceptsFocus = true;
+    m_needParent = true;
+
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxSlider creation failed") );
-       return FALSE;
+        return false;
     }
 
     m_oldPos = 0.0;
@@ -107,11 +148,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)
@@ -137,97 +179,117 @@ 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), 
-                        "value_changed",
-                        (GtkSignalFunc) gtk_slider_callback, 
+
+    GtkEnableEvents();
+    gtk_signal_connect( GTK_OBJECT(m_widget),
+                        "button_press_event",
+                        (GtkSignalFunc)gtk_slider_button_press_callback,
+                        (gpointer) this );
+    gtk_signal_connect( GTK_OBJECT(m_widget),
+                        "button_release_event",
+                        (GtkSignalFunc)gtk_slider_button_release_callback,
                         (gpointer) this );
-        
+
     SetRange( minValue, maxValue );
     SetValue( value );
-  
+
     m_parent->DoAddChild( this );
-  
-    PostCreation();
-  
-    SetBackgroundColour( parent->GetBackgroundColour() );
-
-    Show( TRUE );
-    
-    return TRUE;
+
+    PostCreation(size);
+
+    return true;
 }
 
-int wxSlider::GetValue(void) const
+int wxSlider::GetValue() const
 {
-    return (int)(m_adjust->value+0.5);
+    return wxRound(m_adjust->value);
 }
 
 void wxSlider::SetValue( int value )
 {
-    float fpos = (float)value;
+    double fpos = (double)value;
     m_oldPos = fpos;
-    if (fabs(fpos-m_adjust->value) < 0.2) return;
-    
+    if ( AreSameAdjustValues(fpos, m_adjust->value) )
+        return;
+
     m_adjust->value = fpos;
-  
+
+    GtkDisableEvents();
+
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+
+    GtkEnableEvents();
 }
 
 void wxSlider::SetRange( int minValue, int maxValue )
 {
-    float fmin = (float)minValue;
-    float fmax = (float)maxValue;
-      
+    double fmin = (double)minValue;
+    double fmax = (double)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;
+    m_adjust->step_increment = 1.0;
+    m_adjust->page_increment = ceil((fmax-fmin) / 10.0);
+
+    GtkDisableEvents();
 
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+
+    GtkEnableEvents();
 }
 
-int wxSlider::GetMin(void) const
+int wxSlider::GetMin() const
 {
     return (int)ceil(m_adjust->lower);
 }
 
-int wxSlider::GetMax(void) const
+int wxSlider::GetMax() const
 {
     return (int)ceil(m_adjust->upper);
 }
 
 void wxSlider::SetPageSize( int pageSize )
 {
-    float fpage = (float)pageSize;
-      
+    double fpage = (double)pageSize;
+
     if (fabs(fpage-m_adjust->page_increment) < 0.2) return;
-      
+
     m_adjust->page_increment = fpage;
 
+    GtkDisableEvents();
+
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+
+    GtkEnableEvents();
 }
 
-int wxSlider::GetPageSize(void) const
+int wxSlider::GetPageSize() const
 {
     return (int)ceil(m_adjust->page_increment);
 }
 
 void wxSlider::SetThumbLength( int len )
 {
-    float flen = (float)len;
-      
+    double flen = (double)len;
+
     if (fabs(flen-m_adjust->page_size) < 0.2) return;
-      
+
     m_adjust->page_size = flen;
 
+    GtkDisableEvents();
+
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+
+    GtkEnableEvents();
 }
 
-int wxSlider::GetThumbLength(void) const
+int wxSlider::GetThumbLength() const
 {
     return (int)ceil(m_adjust->page_size);
 }
@@ -236,60 +298,41 @@ void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
 {
 }
 
-int wxSlider::GetLineSize(void) const
-{
-    return 0;
-}
-
-void wxSlider::SetTick( int WXUNUSED(tickPos) )
-{
-}
-
-void wxSlider::SetTickFreq( int WXUNUSED(n), int WXUNUSED(pos) )
-{
-}
-
-int wxSlider::GetTickFreq(void) const
+int wxSlider::GetLineSize() const
 {
     return 0;
 }
 
-void wxSlider::ClearTicks(void)
-{
-}
-
-void wxSlider::SetSelection( int WXUNUSED(minPos), int WXUNUSED(maxPos) )
-{
-}
-
-int wxSlider::GetSelEnd(void) const
-{
-    return 0;
-}
-
-int wxSlider::GetSelStart(void) const
+bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
 {
-    return 0;
+    GtkRange *range = GTK_RANGE(m_widget);
+    return ( (window == GTK_WIDGET(range)->window)
+                || (window == range->trough)
+                || (window == range->slider)
+                || (window == range->step_forw)
+                || (window == range->step_back) );
 }
 
-void wxSlider::ClearSel(void)
+void wxSlider::GtkDisableEvents()
 {
+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_adjust),
+                        GTK_SIGNAL_FUNC(gtk_slider_callback),
+                        (gpointer) this );
 }
 
-bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
+void wxSlider::GtkEnableEvents()
 {
-    GtkRange *range = GTK_RANGE(m_widget);
-    return ( (window == GTK_WIDGET(range)->window) ||
-             (window == range->trough) ||
-             (window == range->slider) ||
-             (window == range->step_forw) ||
-             (window == range->step_back) );
+    gtk_signal_connect( GTK_OBJECT (m_adjust),
+                        "value_changed",
+                        GTK_SIGNAL_FUNC(gtk_slider_callback),
+                        (gpointer) this );
 }
 
-void wxSlider::ApplyWidgetStyle()
+// static
+wxVisualAttributes
+wxSlider::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+    return GetDefaultAttributesFromGTKWidget(gtk_vscale_new);
 }
 
-#endif
+#endif // wxUSE_SLIDER