linking fixes

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

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index 996c428eaa95442883557e4b8412fcb97665e419..eeb55ab4f525e1fa82b2318a32bb44f4027b394f 100644 (file)
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        slider.cpp
+// Name:        gtk/slider.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:           wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -16,10 +16,11 @@
 #if wxUSE_SLIDER
 
 #include "wx/utils.h"
+
 #include <math.h>
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -32,7 +33,9 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
-extern bool   g_blockEventsOnDrag;
+extern bool g_blockEventsOnDrag;
+
+static const float sensitivity = 0.02;
 
 //-----------------------------------------------------------------------------
 // "value_changed"
@@ -46,7 +49,7 @@ static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win )
     if (g_blockEventsOnDrag) return;
 
     float diff = adjust->value - win->m_oldPos;
-    if (fabs(diff) < 0.2) return;
+    if (fabs(diff) < sensitivity) return;
 
     win->m_oldPos = adjust->value;
 
@@ -58,11 +61,11 @@ static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win )
     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);
+    double dvalue = adjust->value;
+    int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);
 
-    int orient = wxHORIZONTAL;
-    if ( (win->GetWindowStyleFlag() & wxSB_VERTICAL) == wxSB_VERTICAL)
-        orient = wxVERTICAL;
+    int orient = win->GetWindowStyleFlag() & wxSL_VERTICAL ? wxVERTICAL
+                                                           : wxHORIZONTAL;
 
     wxScrollEvent event( command, win->GetId(), value, orient );
     event.SetEventObject( win );
@@ -70,6 +73,7 @@ static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win )
 
     wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
     cevent.SetEventObject( win );
+    cevent.SetInt( value );
     win->GetEventHandler()->ProcessEvent( cevent );
 }
 
@@ -79,14 +83,6 @@ static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win )
 
 IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
 
-wxSlider::wxSlider(void)
-{
-}
-
-wxSlider::~wxSlider(void)
-{
-}
-
 bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         int value, int minValue, int maxValue,
         const wxPoint& pos, const wxSize& size,
@@ -99,7 +95,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxSlider creation failed") );
-       return FALSE;
+        return FALSE;
     }
 
     m_oldPos = 0.0;
@@ -112,7 +108,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     if (style & wxSL_LABELS)
     {
         gtk_scale_set_draw_value( GTK_SCALE( m_widget ), TRUE );
-       gtk_scale_set_digits( GTK_SCALE( m_widget ), 0 );
+        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 */
@@ -159,9 +155,12 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     return TRUE;
 }
 
-int wxSlider::GetValue(void) const
+int wxSlider::GetValue() const
 {
-    return (int)(m_adjust->value+0.5);
+    // 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);
 }
 
 void wxSlider::SetValue( int value )
@@ -188,16 +187,18 @@ void wxSlider::SetRange( int minValue, int maxValue )
 
     m_adjust->lower = fmin;
     m_adjust->upper = fmax;
+    m_adjust->step_increment = 1.0;
+    m_adjust->page_increment = ceil((fmax-fmin) / 10.0);
 
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
 }
 
-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);
 }
@@ -213,7 +214,7 @@ void wxSlider::SetPageSize( int pageSize )
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
 }
 
-int wxSlider::GetPageSize(void) const
+int wxSlider::GetPageSize() const
 {
     return (int)ceil(m_adjust->page_increment);
 }
@@ -229,7 +230,7 @@ void wxSlider::SetThumbLength( int len )
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
 }
 
-int wxSlider::GetThumbLength(void) const
+int wxSlider::GetThumbLength() const
 {
     return (int)ceil(m_adjust->page_size);
 }
@@ -238,46 +239,11 @@ 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
-{
-    return 0;
-}
-
-void wxSlider::ClearSel(void)
-{
-}
-
 bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
 {
     GtkRange *range = GTK_RANGE(m_widget);