X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4ee1741f75d443ac816cd90d5d0941d33fdd0698..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/gtk/slider.cpp?ds=sidebyside diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp index fba7a8b971..27f9bdd393 100644 --- a/src/gtk/slider.cpp +++ b/src/gtk/slider.cpp @@ -1,16 +1,19 @@ ///////////////////////////////////////////////////////////////////////////// -// 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__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "slider.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/slider.h" #if wxUSE_SLIDER @@ -19,8 +22,7 @@ #include -#include -#include +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // idle system @@ -33,7 +35,7 @@ extern bool g_isIdle; // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnDrag; static const float sensitivity = 0.02; @@ -41,7 +43,9 @@ static const float sensitivity = 0.02; // "value_changed" //----------------------------------------------------------------------------- -static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win ) +static void gtk_slider_callback( GtkAdjustment *adjust, + SCROLLBAR_CBACK_ARG + wxSlider *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -53,19 +57,13 @@ static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win ) win->m_oldPos = adjust->value; - GtkRange *range = GTK_RANGE( win->m_widget ); - - 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; + wxEventType command = GtkScrollTypeToWx(GET_SCROLL_TYPE(win->m_widget)); - 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 +71,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 +93,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 +106,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 */ @@ -135,10 +134,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id, m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) ); - gtk_signal_connect( GTK_OBJECT(m_adjust), - "value_changed", - (GtkSignalFunc) gtk_slider_callback, - (gpointer) this ); + GtkEnableEvents(); SetRange( minValue, maxValue ); SetValue( value ); @@ -156,7 +152,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 ) @@ -167,7 +166,11 @@ void wxSlider::SetValue( int value ) m_adjust->value = fpos; + GtkDisableEvents(); + gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" ); + + GtkEnableEvents(); } void wxSlider::SetRange( int minValue, int maxValue ) @@ -186,7 +189,11 @@ void wxSlider::SetRange( int minValue, int maxValue ) 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" ); + + GtkEnableEvents(); } int wxSlider::GetMin() const @@ -207,7 +214,11 @@ void wxSlider::SetPageSize( int pageSize ) m_adjust->page_increment = fpage; + GtkDisableEvents(); + gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" ); + + GtkEnableEvents(); } int wxSlider::GetPageSize() const @@ -223,7 +234,11 @@ void wxSlider::SetThumbLength( int len ) m_adjust->page_size = flen; + GtkDisableEvents(); + gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" ); + + GtkEnableEvents(); } int wxSlider::GetThumbLength() const @@ -240,55 +255,39 @@ 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 +bool wxSlider::IsOwnGtkWindow( GdkWindow *window ) { - return 0; + GtkRange *range = GTK_RANGE(m_widget); +#ifdef __WXGTK20__ + return (range->event_window == window); +#else + return ( (window == GTK_WIDGET(range)->window) + || (window == range->trough) + || (window == range->slider) + || (window == range->step_forw) + || (window == range->step_back) ); +#endif } -void wxSlider::ClearSel() +void wxSlider::ApplyWidgetStyle() { + SetWidgetStyle(); + gtk_widget_set_style( m_widget, m_widgetStyle ); } -bool wxSlider::IsOwnGtkWindow( GdkWindow *window ) +void wxSlider::GtkDisableEvents() { - 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_disconnect_by_func( GTK_OBJECT(m_adjust), + GTK_SIGNAL_FUNC(gtk_slider_callback), + (gpointer) this ); } -void wxSlider::ApplyWidgetStyle() +void wxSlider::GtkEnableEvents() { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + gtk_signal_connect( GTK_OBJECT (m_adjust), + "value_changed", + GTK_SIGNAL_FUNC(gtk_slider_callback), + (gpointer) this ); } #endif