X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/80810ca399477ce4736bda433996db6a65bbcbd8..0b7e6e7da208b6a95fb23cb50286a09dc90d96d2:/src/gtk1/slider.cpp?ds=inline

diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp
index c611e0e480..fba7a8b971 100644
--- a/src/gtk1/slider.cpp
+++ b/src/gtk1/slider.cpp
@@ -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
@@ -34,6 +35,8 @@ extern bool g_isIdle;
 
 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;
 
@@ -79,14 +82,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 +94,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,6 +107,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 );
 
         /* labels need more space and too small window will
            cause junk to appear on the dialog */
@@ -158,7 +154,7 @@ 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);
 }
@@ -187,16 +183,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);
 }
@@ -212,7 +210,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);
 }
@@ -228,7 +226,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);
 }
@@ -237,7 +235,7 @@ void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
 {
 }
 
-int wxSlider::GetLineSize(void) const
+int wxSlider::GetLineSize() const
 {
     return 0;
 }
@@ -250,12 +248,12 @@ void wxSlider::SetTickFreq( int WXUNUSED(n), int WXUNUSED(pos) )
 {
 }
 
-int wxSlider::GetTickFreq(void) const
+int wxSlider::GetTickFreq() const
 {
     return 0;
 }
 
-void wxSlider::ClearTicks(void)
+void wxSlider::ClearTicks()
 {
 }
 
@@ -263,17 +261,17 @@ void wxSlider::SetSelection( int WXUNUSED(minPos), int WXUNUSED(maxPos) )
 {
 }
 
-int wxSlider::GetSelEnd(void) const
+int wxSlider::GetSelEnd() const
 {
     return 0;
 }
 
-int wxSlider::GetSelStart(void) const
+int wxSlider::GetSelStart() const
 {
     return 0;
 }
 
-void wxSlider::ClearSel(void)
+void wxSlider::ClearSel()
 {
 }