X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/572c6194d35ad2791c71aee05d6996da2761b07a..c2754d29034199bc158fc079f91c7bca15d40037:/src/gtk1/slider.cpp diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp index 996c428eaa..bd6f84a6c4 100644 --- a/src/gtk1/slider.cpp +++ b/src/gtk1/slider.cpp @@ -16,10 +16,11 @@ #if wxUSE_SLIDER #include "wx/utils.h" + #include -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // 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, @@ -159,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); } @@ -192,12 +187,12 @@ void wxSlider::SetRange( int minValue, int maxValue ) 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 +208,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 +224,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,7 +233,7 @@ void wxSlider::SetLineSize( int WXUNUSED(lineSize) ) { } -int wxSlider::GetLineSize(void) const +int wxSlider::GetLineSize() const { return 0; } @@ -251,12 +246,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() { } @@ -264,17 +259,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() { }