More for wxPython 2.0b9 (hopefully the last...)

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

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index ee6d3eec70e5da7bd70943986c6b5a931f47fd48..5c9ddc9eb554b0439d3ba5adc7c4b63dad8cabf0 100644 (file)
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -19,6 +19,13 @@
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 

+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------


@@ -32,11 +39,14 @@ extern bool   g_blockEventsOnScroll;
 
 static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *win )
 { 
 
 static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *win )
 { 

+    if (g_isIdle) wxapp_install_idle_handler();
+

     if (!win->HasVMT()) return;
     if (g_blockEventsOnDrag) return;
     
     float diff = win->m_adjust->value - win->m_oldPos;
     if (fabs(diff) < 0.2) return;
     if (!win->HasVMT()) return;
     if (g_blockEventsOnDrag) return;
     
     float diff = win->m_adjust->value - win->m_oldPos;
     if (fabs(diff) < 0.2) return;

+    win->m_oldPos = win->m_adjust->value;

   
     wxEventType command = wxEVT_NULL;
   
   
     wxEventType command = wxEVT_NULL;
   


@@ -82,10 +92,12 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget),
                                                  GdkEventButton *WXUNUSED(gdk_event), 
                                                 wxScrollBar *win )
 {
                                                  GdkEventButton *WXUNUSED(gdk_event), 
                                                 wxScrollBar *win )
 {

-  win->m_isScrolling = TRUE;
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    win->m_isScrolling = TRUE;

 //  g_blockEventsOnScroll = TRUE;  doesn't work in DialogEd
   
 //  g_blockEventsOnScroll = TRUE;  doesn't work in DialogEd
   

-  return FALSE;
+    return FALSE;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -96,6 +108,8 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
                                                    GdkEventButton *WXUNUSED(gdk_event), 
                                                   wxScrollBar *win )
 {
                                                    GdkEventButton *WXUNUSED(gdk_event), 
                                                   wxScrollBar *win )
 {

+    if (g_isIdle) wxapp_install_idle_handler();
+

     win->m_isScrolling = FALSE;
 //  g_blockEventsOnScroll = FALSE;
   
     win->m_isScrolling = FALSE;
 //  g_blockEventsOnScroll = FALSE;