missing commit

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

diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp
index 9f595756798574947c513c65abd7a676a5ab3682..089ea23c88e1445a97e7a814e906a3092f8a9e4b 100644 (file)
--- a/src/gtk1/slider.cpp
+++ b/src/gtk1/slider.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/slider.cpp
+// Name:        src/gtk1/slider.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,19 +7,19 @@
 // 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
 
 
 #if wxUSE_SLIDER
 

-#include "wx/utils.h"
+#include "wx/slider.h"

 
 

-#include <math.h>
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/math.h"
+#endif

 
 

-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -34,12 +34,46 @@ extern bool g_isIdle;
 
 extern bool g_blockEventsOnDrag;
 
 
 extern bool g_blockEventsOnDrag;
 

-static const float sensitivity = 0.02;
+// ----------------------------------------------------------------------------
+// helper functions
+// ----------------------------------------------------------------------------
+
+// compare 2 adjustment values up to some (hardcoded) precision
+static inline bool AreSameAdjustValues(double x, double y)
+{
+    return fabs(x - y) < 0.02;
+}
+
+// process a scroll event
+static void
+ProcessScrollEvent(wxSlider *win, wxEventType evtType, double dvalue)
+{
+    int orient = win->GetWindowStyleFlag() & wxSL_VERTICAL ? wxVERTICAL
+                                                           : wxHORIZONTAL;
+
+    int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);
+    wxScrollEvent event( evtType, win->GetId(), value, orient );
+    event.SetEventObject( win );
+    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_SLIDER, win->GetId() );
+    cevent.SetEventObject( win );
+    cevent.SetInt( value );
+    win->HandleWindowEvent( cevent );
+}

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

+extern "C" {

 static void gtk_slider_callback( GtkAdjustment *adjust,
                                  SCROLLBAR_CBACK_ARG
                                  wxSlider *win )
 static void gtk_slider_callback( GtkAdjustment *adjust,
                                  SCROLLBAR_CBACK_ARG
                                  wxSlider *win )


@@ -49,56 +83,69 @@ static void gtk_slider_callback( GtkAdjustment *adjust,
     if (!win->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     if (!win->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 

-    float diff = adjust->value - win->m_oldPos;
-    if (fabs(diff) < sensitivity) return;
+    const double dvalue = adjust->value;
+    const double diff = dvalue - win->m_oldPos;
+    if ( AreSameAdjustValues(diff, 0) )
+        return;

 
 

-    win->m_oldPos = adjust->value;
+    wxEventType evtType;
+    evtType = GtkScrollTypeToWx(GET_SCROLL_TYPE(win->m_widget));

 
 

-    wxEventType command = GtkScrollTypeToWx(GET_SCROLL_TYPE(win->m_widget));
+    ProcessScrollEvent(win, evtType, dvalue);

 
 

-    double dvalue = adjust->value;
-    int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);
+    win->m_oldPos = dvalue;
+}

 
 

-    int orient = win->GetWindowStyleFlag() & wxSL_VERTICAL ? wxVERTICAL
-                                                           : wxHORIZONTAL;
+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;

 
 

-    wxScrollEvent event( command, win->GetId(), value, orient );
-    event.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent( event );
+    return FALSE;
+}
+
+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;
+}

 
 

-    wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
-    cevent.SetEventObject( win );
-    cevent.SetInt( value );
-    win->GetEventHandler()->ProcessEvent( cevent );

 }
 
 //-----------------------------------------------------------------------------
 // wxSlider
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // 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 )
 {
 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") );
 
     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;
 
     if (style & wxSL_VERTICAL)
     }
 
     m_oldPos = 0.0;
 
     if (style & wxSL_VERTICAL)

-        m_widget = gtk_vscale_new( (GtkAdjustment *) NULL );
+        m_widget = gtk_vscale_new( NULL );

     else
     else

-        m_widget = gtk_hscale_new( (GtkAdjustment *) NULL );
+        m_widget = gtk_hscale_new( NULL );

 
     if (style & wxSL_LABELS)
     {
 
     if (style & wxSL_LABELS)
     {


@@ -132,48 +179,50 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
 
     GtkEnableEvents();
     m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
 
     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 );
 
 
     SetRange( minValue, maxValue );
     SetValue( value );
 
     m_parent->DoAddChild( this );
 

-    PostCreation();
-
-    SetBackgroundColour( parent->GetBackgroundColour() );
+    PostCreation(size);

 
 

-    Show( TRUE );
-
-    return TRUE;
+    return true;

 }
 
 int wxSlider::GetValue() const
 {
 }
 
 int wxSlider::GetValue() const
 {

-    // we want to round to the nearest integer, i.e. 0.9 is rounded to 1 and
-    // -0.9 is rounded to -1
-    double val = m_adjust->value;
-    return (int)(val < 0 ? val - 0.5 : val + 0.5);
+    return wxRound(m_adjust->value);

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

-    float fpos = (float)value;
+    double fpos = (double)value;

     m_oldPos = fpos;
     m_oldPos = fpos;

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

 
     m_adjust->value = fpos;
 
     GtkDisableEvents();
 
     m_adjust->value = fpos;
 
     GtkDisableEvents();

-    
+

     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );

-    
+

     GtkEnableEvents();
 }
 
 void wxSlider::SetRange( int minValue, int maxValue )
 {
     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))
 
     if ((fabs(fmin-m_adjust->lower) < 0.2) &&
         (fabs(fmax-m_adjust->upper) < 0.2))


@@ -187,9 +236,9 @@ void wxSlider::SetRange( int minValue, int maxValue )
     m_adjust->page_increment = ceil((fmax-fmin) / 10.0);
 
     GtkDisableEvents();
     m_adjust->page_increment = ceil((fmax-fmin) / 10.0);
 
     GtkDisableEvents();

-    
+

     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );

-    
+

     GtkEnableEvents();
 }
 
     GtkEnableEvents();
 }
 


@@ -205,16 +254,16 @@ int wxSlider::GetMax() const
 
 void wxSlider::SetPageSize( int pageSize )
 {
 
 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();
 
     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" );
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );

-    
+

     GtkEnableEvents();
 }
 
     GtkEnableEvents();
 }
 


@@ -225,16 +274,16 @@ int wxSlider::GetPageSize() const
 
 void wxSlider::SetThumbLength( int len )
 {
 
 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();
 
     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" );
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );

-    
+

     GtkEnableEvents();
 }
 
     GtkEnableEvents();
 }
 


@@ -256,19 +305,10 @@ bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
 {
     GtkRange *range = GTK_RANGE(m_widget);
     return ( (window == GTK_WIDGET(range)->window)
 {
     GtkRange *range = GTK_RANGE(m_widget);
     return ( (window == GTK_WIDGET(range)->window)

-#ifndef __WXGTK20__

                 || (window == range->trough)
                 || (window == range->slider)
                 || (window == range->step_forw)
                 || (window == range->trough)
                 || (window == range->slider)
                 || (window == range->step_forw)

-                || (window == range->step_back)
-#endif // GTK+ 1.x
-           );
-}
-
-void wxSlider::ApplyWidgetStyle()
-{
-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+                || (window == range->step_back) );

 }
 
 void wxSlider::GtkDisableEvents()
 }
 
 void wxSlider::GtkDisableEvents()


@@ -286,4 +326,11 @@ void wxSlider::GtkEnableEvents()
                         (gpointer) this );
 }
 
                         (gpointer) this );
 }
 

-#endif
+// static
+wxVisualAttributes
+wxSlider::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_vscale_new);
+}
+
+#endif // wxUSE_SLIDER