X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b8a521e5993217b027e8045f0a211957cba945d..ee3510132b8b4160f848bd4f502a6f5315f90dbc:/src/gtk1/slider.cpp diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp index 778407f9ed..eeb55ab4f5 100644 --- a/src/gtk1/slider.cpp +++ b/src/gtk1/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__ @@ -33,7 +33,7 @@ extern bool g_isIdle; // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnDrag; static const float sensitivity = 0.02; @@ -61,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 ); @@ -73,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 ); } @@ -94,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; @@ -107,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 */ @@ -156,7 +157,10 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id, 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 ) @@ -183,6 +187,8 @@ 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" ); } @@ -238,41 +244,6 @@ int wxSlider::GetLineSize() const 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 -{ - return 0; -} - -void wxSlider::ClearSel() -{ -} - bool wxSlider::IsOwnGtkWindow( GdkWindow *window ) { GtkRange *range = GTK_RANGE(m_widget);