added missing headers (patch 1774617)

[wxWidgets.git] / src / gtk / scrolbar.cpp

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index cf66761a5d826c207bd0d9eed631d81de1fc0e67..dc05a81b0af74e547f3e2440eeb3a6a4fc0c2fea 100644 (file)
--- 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,41 +54,54 @@ extern "C" {
 static gboolean
 gtk_button_press_event(GtkRange*, GdkEventButton*, wxScrollBar* win)
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
     win->m_mouseButtonDown = true;
     return false;
 }
 }
 
 //-----------------------------------------------------------------------------
-// "button_release_event" from scrollbar
+// "event_after" from scrollbar
 //-----------------------------------------------------------------------------
 
 extern "C" {
-static gboolean
-gtk_button_release_event(GtkRange*, GdkEventButton*, wxScrollBar* win)
+static void
+gtk_event_after(GtkRange* range, GdkEvent* event, wxScrollBar* win)
 {
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
-    win->m_mouseButtonDown = false;
-    // If thumb tracking
-    if (win->m_isScrolling)
+    if (event->type == GDK_BUTTON_RELEASE)
     {
-        win->m_isScrolling = false;
+        g_signal_handlers_block_by_func(range, (void*)gtk_event_after, win);
+
         const int value = win->GetThumbPosition();
         const int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
 
         wxScrollEvent event(wxEVT_SCROLL_THUMBRELEASE, win->GetId(), value, orient);
         event.SetEventObject(win);
-        // To allow setting scroll position from event handler, sending event must
-        // be deferred until after the GtkRange handler for this signal has run
-        win->GetEventHandler()->AddPendingEvent(event);
+        win->GetEventHandler()->ProcessEvent(event);
 
         wxScrollEvent event2(wxEVT_SCROLL_CHANGED, win->GetId(), value, orient);
         event2.SetEventObject(win);
-        win->GetEventHandler()->AddPendingEvent(event2);
+        win->GetEventHandler()->ProcessEvent(event2);
+    }
+}
+}
+
+//-----------------------------------------------------------------------------
+// "button_release_event" from scrollbar
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static gboolean
+gtk_button_release_event(GtkRange* range, GdkEventButton*, wxScrollBar* win)
+{
+    win->m_mouseButtonDown = false;
+    // If thumb tracking
+    if (win->m_isScrolling)
+    {
+        win->m_isScrolling = false;
+        // Hook up handler to send thumb release event after this emission is finished.
+        // To allow setting scroll position from event handler, sending event must
+        // be deferred until after the GtkRange handler for this signal has run
+        g_signal_handlers_unblock_by_func(range, (void*)gtk_event_after, win);
     }
 
     return false;
@@ -116,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 ))
     {
@@ -134,13 +141,18 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 
     m_scrollBar[int(isVertical)] = (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);
     g_signal_connect(m_widget, "button_release_event",
                      G_CALLBACK(gtk_button_release_event), this);
 
+    gulong handler_id;
+    handler_id = g_signal_connect(
+        m_widget, "event_after", G_CALLBACK(gtk_event_after), this);
+    g_signal_handler_block(m_widget, handler_id);
+
     m_parent->DoAddChild( this );
 
     PostCreation(size);
@@ -186,11 +198,14 @@ void wxScrollBar::SetThumbPosition( int viewStart )
 
         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_adjustment_value_changed(adj);
+
+        g_signal_handlers_unblock_by_func(m_widget,
+            (gpointer)gtk_value_changed, this);
     }
 }
 
@@ -225,10 +240,9 @@ void wxScrollBar::SetRange(int range)
     SetScrollbar(GetThumbPosition(), GetThumbSize(), range, GetPageSize());
 }
 
-bool wxScrollBar::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxScrollBar::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
-    GtkRange *range = GTK_RANGE(m_widget);
-    return ( (window == GTK_WIDGET(range)->window) );
+    return m_widget->window;
 }
 
 // static