X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3312ee03a7b1b378a880d5ace627f937f9cc6a72..abd474ea63667f727940a009cc3e0b23ba9f418f:/src/gtk/slider.cpp?ds=sidebyside diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp index a0998bc13b..0527106ad9 100644 --- a/src/gtk/slider.cpp +++ b/src/gtk/slider.cpp @@ -20,6 +20,7 @@ #endif #include +#include "wx/gtk/private/gtk2-compat.h" //----------------------------------------------------------------------------- // data @@ -124,10 +125,9 @@ extern "C" { static void gtk_value_changed(GtkRange* range, wxSlider* win) { - GtkAdjustment* adj = gtk_range_get_adjustment (range); - const int pos = wxRound(adj->value); + const double value = gtk_range_get_value(range); const double oldPos = win->m_pos; - win->m_pos = adj->value; + win->m_pos = value; if (!win->m_hasVMT || g_blockEventsOnDrag) return; @@ -151,18 +151,19 @@ gtk_value_changed(GtkRange* range, wxSlider* win) else if (win->m_mouseButtonDown) { // Difference from last change event - const double diff = adj->value - oldPos; + const double diff = value - oldPos; const bool isDown = diff > 0; - if (IsScrollIncrement(adj->page_increment, diff)) + GtkAdjustment* adj = gtk_range_get_adjustment(range); + if (IsScrollIncrement(gtk_adjustment_get_page_increment(adj), diff)) { eventType = isDown ? wxEVT_SCROLL_PAGEDOWN : wxEVT_SCROLL_PAGEUP; } - else if (wxIsSameDouble(adj->value, 0)) + else if (wxIsSameDouble(value, 0)) { eventType = wxEVT_SCROLL_PAGEUP; } - else if (wxIsSameDouble(adj->value, adj->upper)) + else if (wxIsSameDouble(value, gtk_adjustment_get_upper(adj))) { eventType = wxEVT_SCROLL_PAGEDOWN; } @@ -178,7 +179,7 @@ gtk_value_changed(GtkRange* range, wxSlider* win) win->m_scrollEventType = GTK_SCROLL_NONE; // If integral position has changed - if (wxRound(oldPos) != pos) + if (wxRound(oldPos) != wxRound(value)) { ProcessScrollEvent(win, eventType); win->m_needThumbRelease = eventType == wxEVT_SCROLL_THUMBTRACK; @@ -272,8 +273,6 @@ static gchar* gtk_format_value(GtkScale*, double value, void*) // wxSlider //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl) - wxSlider::wxSlider() { m_pos = 0; @@ -302,7 +301,7 @@ bool wxSlider::Create(wxWindow *parent, wxFAIL_MSG( wxT("wxSlider creation failed") ); return false; } - + if (style & wxSL_VERTICAL) m_scale = gtk_vscale_new( NULL ); @@ -313,7 +312,7 @@ bool wxSlider::Create(wxWindow *parent, if (style & wxSL_MIN_MAX_LABELS) { gtk_widget_show( m_scale ); - + if (style & wxSL_VERTICAL) m_widget = gtk_hbox_new(false, 0); else @@ -330,20 +329,20 @@ bool wxSlider::Create(wxWindow *parent, g_object_ref(box); gtk_widget_show(box); gtk_container_add( GTK_CONTAINER(m_widget), box ); - + m_minLabel = gtk_label_new(NULL); g_object_ref(m_minLabel); gtk_widget_show( m_minLabel ); gtk_container_add( GTK_CONTAINER(box), m_minLabel ); gtk_box_set_child_packing( GTK_BOX(box), m_minLabel, FALSE, FALSE, 0, GTK_PACK_START ); - + // expanding empty space between the min/max labels GtkWidget *space = gtk_label_new(NULL); g_object_ref(space); gtk_widget_show( space ); gtk_container_add( GTK_CONTAINER(box), space ); gtk_box_set_child_packing( GTK_BOX(box), space, TRUE, FALSE, 0, GTK_PACK_START ); - + m_maxLabel = gtk_label_new(NULL); g_object_ref(m_maxLabel); gtk_widget_show( m_maxLabel ); @@ -356,15 +355,33 @@ bool wxSlider::Create(wxWindow *parent, m_maxLabel = NULL; m_minLabel = NULL; } - - if (style & wxSL_VALUE_LABEL) + + const bool showValueLabel = (style & wxSL_VALUE_LABEL) != 0; + gtk_scale_set_draw_value(GTK_SCALE (m_scale), showValueLabel ); + if ( showValueLabel ) { - gtk_scale_set_draw_value(GTK_SCALE (m_scale), TRUE ); - - if (style & wxSL_VERTICAL) - gtk_scale_set_value_pos( GTK_SCALE(m_scale), GTK_POS_LEFT ); + // position the label appropriately: notice that wxSL_DIRECTION flags + // specify the position of the ticks, not label, under MSW and so the + // label is on the opposite side + GtkPositionType posLabel; + if ( style & wxSL_VERTICAL ) + { + if ( style & wxSL_LEFT ) + posLabel = GTK_POS_RIGHT; + else // if ( style & wxSL_RIGHT ) -- this is also the default + posLabel = GTK_POS_LEFT; + } + else // horizontal slider + { + if ( style & wxSL_TOP ) + posLabel = GTK_POS_BOTTOM; + else // if ( style & wxSL_BOTTOM) -- this is again the default + posLabel = GTK_POS_TOP; + } + + gtk_scale_set_value_pos( GTK_SCALE(m_scale), posLabel ); } - + // Keep full precision in position value gtk_scale_set_digits(GTK_SCALE (m_scale), -1); @@ -422,6 +439,8 @@ void wxSlider::GTKSetValue(int value) { GTKDisableEvents(); gtk_range_set_value(GTK_RANGE (m_scale), value); + // GTK only updates value label if handle moves at least 1 pixel + gtk_widget_queue_draw(m_scale); GTKEnableEvents(); } @@ -433,34 +452,36 @@ void wxSlider::SetRange( int minValue, int maxValue ) gtk_range_set_range(GTK_RANGE (m_scale), minValue, maxValue); gtk_range_set_increments(GTK_RANGE (m_scale), 1, (maxValue - minValue + 9) / 10); GTKEnableEvents(); - + if (HasFlag(wxSL_MIN_MAX_LABELS)) { wxString str; - + str.Printf( "%d", minValue ); if (HasFlag(wxSL_INVERSE)) gtk_label_set_text( GTK_LABEL(m_maxLabel), str.utf8_str() ); else gtk_label_set_text( GTK_LABEL(m_minLabel), str.utf8_str() ); - + str.Printf( "%d", maxValue ); if (HasFlag(wxSL_INVERSE)) gtk_label_set_text( GTK_LABEL(m_minLabel), str.utf8_str() ); else gtk_label_set_text( GTK_LABEL(m_maxLabel), str.utf8_str() ); - + } } int wxSlider::GetMin() const { - return int(gtk_range_get_adjustment (GTK_RANGE (m_scale))->lower); + GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(m_scale)); + return int(gtk_adjustment_get_lower(adj)); } int wxSlider::GetMax() const { - return int(gtk_range_get_adjustment (GTK_RANGE (m_scale))->upper); + GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(m_scale)); + return int(gtk_adjustment_get_upper(adj)); } void wxSlider::SetPageSize( int pageSize ) @@ -472,7 +493,8 @@ void wxSlider::SetPageSize( int pageSize ) int wxSlider::GetPageSize() const { - return int(gtk_range_get_adjustment (GTK_RANGE (m_scale))->page_increment); + GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(m_scale)); + return int(gtk_adjustment_get_page_increment(adj)); } // GTK does not support changing the size of the slider @@ -494,7 +516,8 @@ void wxSlider::SetLineSize( int lineSize ) int wxSlider::GetLineSize() const { - return int(gtk_range_get_adjustment (GTK_RANGE (m_scale))->step_increment); + GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(m_scale)); + return int(gtk_adjustment_get_step_increment(adj)); } GdkWindow *wxSlider::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const