Applied patch for more compliant wxScrolbar event

    generation order.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index 28cf2350d8576cbefa97f1018a05269f7632c0ee..d9846c10677da32aa419cc708bbbfe1bf8afc0b1 100644 (file)
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -67,10 +67,6 @@ static void gtk_scrollbar_callback( GtkAdjustment *adjust,
 
     int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
 
-    wxScrollEvent event( command, win->GetId(), value, orient );
-    event.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent( event );
-
     // throw a LINEUP / LINEDOWN event if necessary
     if (g_currentUpDownEvent != wxEVT_NULL)
     {
@@ -78,6 +74,11 @@ static void gtk_scrollbar_callback( GtkAdjustment *adjust,
         event.SetEventObject( win );
         win->GetEventHandler()->ProcessEvent( event );
       }
+    
+       // throw other event (wxEVT_SCROLL_THUMBTRACK)
+       wxScrollEvent event( command, win->GetId(), value, orient );
+    event.SetEventObject( win );
+    win->GetEventHandler()->ProcessEvent( event );
 
 /*
     wxCommandEvent cevent( wxEVT_COMMAND_SCROLLBAR_UPDATED, win->GetId() );

diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp
index 28cf2350d8576cbefa97f1018a05269f7632c0ee..d9846c10677da32aa419cc708bbbfe1bf8afc0b1 100644 (file)
--- a/src/gtk1/scrolbar.cpp
+++ b/src/gtk1/scrolbar.cpp
@@ -67,10 +67,6 @@ static void gtk_scrollbar_callback( GtkAdjustment *adjust,
 
     int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
 
-    wxScrollEvent event( command, win->GetId(), value, orient );
-    event.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent( event );
-
     // throw a LINEUP / LINEDOWN event if necessary
     if (g_currentUpDownEvent != wxEVT_NULL)
     {
@@ -78,6 +74,11 @@ static void gtk_scrollbar_callback( GtkAdjustment *adjust,
         event.SetEventObject( win );
         win->GetEventHandler()->ProcessEvent( event );
       }
+    
+       // throw other event (wxEVT_SCROLL_THUMBTRACK)
+       wxScrollEvent event( command, win->GetId(), value, orient );
+    event.SetEventObject( win );
+    win->GetEventHandler()->ProcessEvent( event );
 
 /*
     wxCommandEvent cevent( wxEVT_COMMAND_SCROLLBAR_UPDATED, win->GetId() );