X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1481968400c94128642815b6871724f118141cbc..8fd7108e7cfd6d3564a71ab5f49c391613e27798:/src/gtk/scrolbar.cpp

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index 00ea880973..343e27f848 100644
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -32,11 +32,9 @@ gtk_value_changed(GtkRange* range, wxScrollBar* win)
     if (eventType != wxEVT_NULL)
     {
         const int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
-        const int i = orient == wxVERTICAL;
         const int value = win->GetThumbPosition();
         wxScrollEvent event(eventType, win->GetId(), value, orient);
         event.SetEventObject(win);
-        win->m_blockValueChanged[i] = true;
         win->GetEventHandler()->ProcessEvent(event);
         if (!win->m_isScrolling)
         {
@@ -44,7 +42,6 @@ gtk_value_changed(GtkRange* range, wxScrollBar* win)
             event.SetEventObject(win);
             win->GetEventHandler()->ProcessEvent(event);
         }
-        win->m_blockValueChanged[i] = false;
     }
 }
 }
@@ -57,8 +54,6 @@ extern "C" {
 static gboolean
 gtk_button_press_event(GtkRange*, GdkEventButton*, wxScrollBar* win)
 {
-    // don't need to install idle handler, its done from "event" signal
-
     win->m_mouseButtonDown = true;
     return false;
 }
@@ -98,8 +93,6 @@ extern "C" {
 static gboolean
 gtk_button_release_event(GtkRange* range, GdkEventButton*, wxScrollBar* win)
 {
-    // don't need to install idle handler, its done from "event" signal
-
     win->m_mouseButtonDown = false;
     // If thumb tracking
     if (win->m_isScrolling)
@@ -133,9 +126,6 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos, const wxSize& size,
            long style, const wxValidator& validator, const wxString& name )
 {
-    m_needParent = true;
-    m_acceptsFocus = true;
-
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
@@ -149,9 +139,9 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
     else
         m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL );
 
-    m_scrollBar[int(isVertical)] = (GtkRange*)m_widget;
+    m_scrollBar[0] = (GtkRange*)m_widget;
 
-    g_signal_connect(m_widget, "value_changed",
+    g_signal_connect_after(m_widget, "value_changed",
                      G_CALLBACK(gtk_value_changed), this);
     g_signal_connect(m_widget, "button_press_event",
                      G_CALLBACK(gtk_button_press_event), this);
@@ -198,21 +188,14 @@ void wxScrollBar::SetThumbPosition( int viewStart )
 {
     if (GetThumbPosition() != viewStart)
     {
-        GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
-        const int i = (GtkRange*)m_widget == m_scrollBar[1];
-        const int max = int(adj->upper - adj->page_size);
-        if (viewStart > max)
-            viewStart = max;
-        if (viewStart < 0)
-            viewStart = 0;
-
-        m_scrollPos[i] =
-        adj->value = viewStart;
-        // If a "value_changed" signal emission is not already in progress
-        if (!m_blockValueChanged[i])
-        {
-            gtk_adjustment_value_changed(adj);
-        }
+        g_signal_handlers_block_by_func(m_widget,
+            (gpointer)gtk_value_changed, this);
+
+        gtk_range_set_value((GtkRange*)m_widget, viewStart);
+        m_scrollPos[0] = gtk_range_get_value((GtkRange*)m_widget);
+
+        g_signal_handlers_unblock_by_func(m_widget,
+            (gpointer)gtk_value_changed, this);
     }
 }
 
@@ -224,17 +207,15 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
         range =
         thumbSize = 1;
     }
-    if (position > range - thumbSize)
-        position = range - thumbSize;
-    if (position < 0)
-        position = 0;
     GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
     adj->step_increment = 1;
     adj->page_increment = pageSize;
     adj->page_size = thumbSize;
-    adj->upper = range;
-    SetThumbPosition(position);
-    gtk_adjustment_changed(adj);
+    adj->value = position;
+    g_signal_handlers_block_by_func(m_widget, (void*)gtk_value_changed, this);
+    gtk_range_set_range((GtkRange*)m_widget, 0, range);
+    m_scrollPos[0] = adj->value;
+    g_signal_handlers_unblock_by_func(m_widget, (void*)gtk_value_changed, this);
 }
 
 void wxScrollBar::SetPageSize( int pageLength )
@@ -249,7 +230,7 @@ void wxScrollBar::SetRange(int range)
 
 GdkWindow *wxScrollBar::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
-    return GTK_WIDGET(GTK_RANGE(m_widget))->window;
+    return m_widget->window;
 }
 
 // static