Allow OS X Cocoa (or any OS X port) to override GetBestSize and provide a native...

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

diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp
index 58aa39db8193429e5844070da999d97ba0226394..7a7a4f0e6b0ac841026a1a5a12e0085706cd6381 100644 (file)
--- a/src/gtk1/slider.cpp
+++ b/src/gtk1/slider.cpp
@@ -1,26 +1,25 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // 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
 
 
 #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 <gdk/gdk.h>
-#include <gtk/gtk.h>
+#include "wx/gtk1/private.h"

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


@@ -33,48 +32,93 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

-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_COMMAND_SLIDER_UPDATED, win->GetId() );
+    cevent.SetEventObject( win );
+    cevent.SetInt( value );
+    win->HandleWindowEvent( cevent );
+}

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

-static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win )
+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;
 
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     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));

 
 

-    GtkRange *range = GTK_RANGE( win->m_widget );
+    ProcessScrollEvent(win, evtType, dvalue);

 
 

-    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;
+    win->m_oldPos = dvalue;
+}

 
 

-    int value = (int)ceil(adjust->value);
+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;

 
 

-    int orient = wxHORIZONTAL;
-    if ( (win->GetWindowStyleFlag() & wxSB_VERTICAL) == wxSB_VERTICAL)
-        orient = wxVERTICAL;
+    return FALSE;
+}

 
 

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

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


@@ -88,22 +132,22 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         const wxPoint& pos, const wxSize& size,
         long style, const wxValidator& validator, const wxString& name )
 {
         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)
     {


@@ -136,9 +180,14 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 
     m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
 
 
     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 );
                         (gpointer) this );
 
     SetRange( minValue, maxValue );


@@ -146,38 +195,36 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 
     m_parent->DoAddChild( this );
 
 
     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;
 
 
     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 )
 {
 }
 
 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))


@@ -190,7 +237,11 @@ void wxSlider::SetRange( int minValue, int maxValue )
     m_adjust->step_increment = 1.0;
     m_adjust->page_increment = ceil((fmax-fmin) / 10.0);
 
     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" );
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );

+
+    GtkEnableEvents();

 }
 
 int wxSlider::GetMin() const
 }
 
 int wxSlider::GetMin() const


@@ -205,13 +256,17 @@ 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;
 
 
     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();

 }
 
 int wxSlider::GetPageSize() const
 }
 
 int wxSlider::GetPageSize() const


@@ -221,13 +276,17 @@ 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;
 
 
     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();

 }
 
 int wxSlider::GetThumbLength() const
 }
 
 int wxSlider::GetThumbLength() const


@@ -244,55 +303,36 @@ int wxSlider::GetLineSize() const
     return 0;
 }
 
     return 0;
 }
 

-void wxSlider::SetTick( int WXUNUSED(tickPos) )
-{
-}
-
-void wxSlider::SetTickFreq( int WXUNUSED(n), int WXUNUSED(pos) )
-{
-}
-
-int wxSlider::GetTickFreq() const
-{
-    return 0;
-}
-
-void wxSlider::ClearTicks()
-{
-}
-
-void wxSlider::SetSelection( int WXUNUSED(minPos), int WXUNUSED(maxPos) )
-{
-}
-
-int wxSlider::GetSelEnd() const
-{
-    return 0;
-}
-
-int wxSlider::GetSelStart() 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 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