X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/572c6194d35ad2791c71aee05d6996da2761b07a..b77b87881bae2e6306366d79e7fe160334b3d4a2:/src/gtk/slider.cpp diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp index 996c428eaa..f3ab24213f 100644 --- a/src/gtk/slider.cpp +++ b/src/gtk/slider.cpp @@ -1,25 +1,28 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 #include "wx/utils.h" + #include -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // idle system @@ -32,13 +35,17 @@ extern bool g_isIdle; // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnDrag; + +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(); @@ -46,23 +53,17 @@ 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; - GtkRange *range = GTK_RANGE( win->m_widget ); + wxEventType command = GtkScrollTypeToWx(GET_SCROLL_TYPE(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; + double dvalue = adjust->value; + int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5); - int value = (int)ceil(adjust->value); - - 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 +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 ); } @@ -79,14 +81,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 +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; @@ -112,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 */ @@ -140,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 ); @@ -151,17 +142,19 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id, m_parent->DoAddChild( this ); PostCreation(); - - SetBackgroundColour( parent->GetBackgroundColour() ); + InheritAttributes(); Show( TRUE ); 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 ) @@ -172,7 +165,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 ) @@ -188,16 +185,22 @@ 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); + GtkDisableEvents(); + gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" ); + + GtkEnableEvents(); } -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); } @@ -210,10 +213,14 @@ 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(void) const +int wxSlider::GetPageSize() const { return (int)ceil(m_adjust->page_increment); } @@ -226,10 +233,14 @@ 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(void) const +int wxSlider::GetThumbLength() const { return (int)ceil(m_adjust->page_size); } @@ -238,60 +249,44 @@ 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 -{ - return 0; -} - -void wxSlider::ClearTicks(void) -{ -} - -void wxSlider::SetSelection( int WXUNUSED(minPos), int WXUNUSED(maxPos) ) -{ -} - -int wxSlider::GetSelEnd(void) const +int wxSlider::GetLineSize() const { return 0; } -int wxSlider::GetSelStart(void) 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) +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