X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0a9fe92fa450c1200a30dd863cba0809ea0206a..88932ec82d048d006cdc81bd309f5e59aee799ac:/src/gtk/slider.cpp diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp index 83deaec5f3..7e49ff26b4 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,12 +125,11 @@ 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) + if (g_blockEventsOnDrag) return; if (win->GTKEventsDisabled()) @@ -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,14 +273,15 @@ static gchar* gtk_format_value(GtkScale*, double value, void*) // wxSlider //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl) - wxSlider::wxSlider() { - m_pos = 0; - m_scrollEventType = GTK_SCROLL_NONE; - m_needThumbRelease = false; - m_blockScrollEvent = false; + m_scale = NULL; +} + +wxSlider::~wxSlider() +{ + if (m_scale && m_scale != m_widget) + GTKDisconnect(m_scale); } bool wxSlider::Create(wxWindow *parent, @@ -295,6 +297,8 @@ bool wxSlider::Create(wxWindow *parent, { m_pos = value; m_scrollEventType = GTK_SCROLL_NONE; + m_needThumbRelease = false; + m_blockScrollEvent = false; if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) @@ -303,52 +307,32 @@ bool wxSlider::Create(wxWindow *parent, return false; } - - if (style & wxSL_VERTICAL) - m_scale = gtk_vscale_new( NULL ); - else - m_scale = gtk_hscale_new( NULL ); - g_object_ref(m_scale); + const bool isVertical = (style & wxSL_VERTICAL) != 0; + m_scale = gtk_scale_new(GtkOrientation(isVertical), NULL); if (style & wxSL_MIN_MAX_LABELS) { gtk_widget_show( m_scale ); - if (style & wxSL_VERTICAL) - m_widget = gtk_hbox_new(false, 0); - else - m_widget = gtk_vbox_new(false, 0); - g_object_ref(m_widget); - gtk_widget_show( m_widget ); - gtk_container_add( GTK_CONTAINER(m_widget), m_scale ); - - GtkWidget *box; - if (style & wxSL_VERTICAL) - box = gtk_vbox_new(false,0); - else - box = gtk_hbox_new(false,0); - g_object_ref(box); + m_widget = gtk_box_new(GtkOrientation(!isVertical), 0); + gtk_box_pack_start(GTK_BOX(m_widget), m_scale, true, true, 0); + + GtkWidget* box = gtk_box_new(GtkOrientation(isVertical), 0); gtk_widget_show(box); - gtk_container_add( GTK_CONTAINER(m_widget), box ); + gtk_box_pack_start(GTK_BOX(m_widget), box, true, true, 0); 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 ); + gtk_box_pack_start(GTK_BOX(box), m_minLabel, false, false, 0); // 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 ); + gtk_box_pack_start(GTK_BOX(box), space, true, false, 0); m_maxLabel = gtk_label_new(NULL); - g_object_ref(m_maxLabel); gtk_widget_show( m_maxLabel ); - gtk_container_add( GTK_CONTAINER(box), m_maxLabel ); - gtk_box_set_child_packing( GTK_BOX(box), m_maxLabel, FALSE, FALSE, 0, GTK_PACK_END ); + gtk_box_pack_end(GTK_BOX(box), m_maxLabel, false, false, 0); } else { @@ -356,6 +340,7 @@ bool wxSlider::Create(wxWindow *parent, m_maxLabel = NULL; m_minLabel = NULL; } + g_object_ref(m_widget); const bool showValueLabel = (style & wxSL_VALUE_LABEL) != 0; gtk_scale_set_draw_value(GTK_SCALE (m_scale), showValueLabel ); @@ -440,6 +425,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(); } @@ -473,12 +460,14 @@ void wxSlider::SetRange( int minValue, int maxValue ) 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 ) @@ -490,7 +479,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 @@ -512,19 +502,25 @@ 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 { +#ifdef __WXGTK3__ + // no access to internal GdkWindows + return NULL; +#else return GTK_RANGE(m_scale)->event_window; +#endif } // static wxVisualAttributes wxSlider::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - return GetDefaultAttributesFromGTKWidget(gtk_vscale_new); + return GetDefaultAttributesFromGTKWidget(gtk_scale_new(GTK_ORIENTATION_VERTICAL, NULL)); } #endif // wxUSE_SLIDER