X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3bc755fc89fbb7ef10442c6b5216f4c77abf4bd8..d38ceae8b9d776425a058e9b652ca143cd049a2f:/src/gtk1/scrolbar.cpp

diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp
index 312985e972..5c9ddc9eb5 100644
--- a/src/gtk1/scrolbar.cpp
+++ b/src/gtk1/scrolbar.cpp
@@ -16,11 +16,22 @@
 #include "wx/utils.h"
 #include <math.h>
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 
 extern bool   g_blockEventsOnDrag;
+extern bool   g_blockEventsOnScroll;
 
 //-----------------------------------------------------------------------------
 // "value_changed"
@@ -28,38 +39,48 @@ extern bool   g_blockEventsOnDrag;
 
 static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *win )
 { 
-  if (!win->HasVMT()) return;
-  if (g_blockEventsOnDrag) return;
+    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;
+    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;
   
-  float line_step = win->m_adjust->step_increment;
-  float page_step = win->m_adjust->page_increment;
+    float line_step = win->m_adjust->step_increment;
+    float page_step = win->m_adjust->page_increment;
   
-  if (fabs(win->m_adjust->value-win->m_adjust->lower) < 0.2) command = wxEVT_SCROLL_BOTTOM;
-  else if (fabs(win->m_adjust->value-win->m_adjust->upper) < 0.2) command = wxEVT_SCROLL_TOP;
-  else if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLL_LINEDOWN;
-  else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP;
-  else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN;
-  else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
-  else command = wxEVT_SCROLL_THUMBTRACK;
-
-  int value = (int)(win->m_adjust->value+0.5);
+    if (win->m_isScrolling)
+    {
+        command = wxEVT_SCROLL_THUMBTRACK;
+    }
+    else
+    {
+        if (fabs(win->m_adjust->value-win->m_adjust->lower) < 0.2) command = wxEVT_SCROLL_BOTTOM;
+        else if (fabs(win->m_adjust->value-win->m_adjust->upper) < 0.2) command = wxEVT_SCROLL_TOP;
+        else if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLL_LINEDOWN;
+        else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP;
+        else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN;
+        else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
+        else command = wxEVT_SCROLL_THUMBTRACK;
+    }
+
+    int value = (int)(win->m_adjust->value+0.5);
       
-  int orient = wxHORIZONTAL;
-  if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;
+    int orient = wxHORIZONTAL;
+    if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;
   
-  wxScrollEvent event( command, win->GetId(), value, orient );
-  event.SetEventObject( win );
-  win->GetEventHandler()->ProcessEvent( event );
+    wxScrollEvent event( command, win->GetId(), value, orient );
+    event.SetEventObject( win );
+    win->GetEventHandler()->ProcessEvent( event );
   
 /*
-  wxCommandEvent cevent( wxEVT_COMMAND_SCROLLBAR_UPDATED, win->GetId() );
-  cevent.SetEventObject( win );
-  win->ProcessEvent( cevent );
+    wxCommandEvent cevent( wxEVT_COMMAND_SCROLLBAR_UPDATED, win->GetId() );
+    cevent.SetEventObject( win );
+    win->ProcessEvent( cevent );
 */
 }
 
@@ -67,28 +88,34 @@ static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *wi
 // "button_press_event" from slider
 //-----------------------------------------------------------------------------
 
-static gint gtk_scrollbar_button_press_callback( GtkRange *widget, GdkEventButton *gdk_event, wxScrollBar *win )
+static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget), 
+                                                 GdkEventButton *WXUNUSED(gdk_event), 
+						 wxScrollBar *win )
 {
-  if (gdk_event->window != widget->slider) return FALSE;
-    
-  win->m_isScrolling = TRUE;
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    win->m_isScrolling = TRUE;
+//  g_blockEventsOnScroll = TRUE;  doesn't work in DialogEd
   
-  return FALSE;
+    return FALSE;
 }
 
 //-----------------------------------------------------------------------------
 // "button_release_event" from slider
 //-----------------------------------------------------------------------------
 
-static gint gtk_scrollbar_button_release_callback( GtkRange *widget, GdkEventButton *gdk_event, wxScrollBar *win )
+static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget), 
+                                                   GdkEventButton *WXUNUSED(gdk_event), 
+						   wxScrollBar *win )
 {
-  if (gdk_event->window != widget->slider) return FALSE;
+    if (g_isIdle) wxapp_install_idle_handler();
 
-  gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
-      
-  win->m_isScrolling = FALSE;
+    win->m_isScrolling = FALSE;
+//  g_blockEventsOnScroll = FALSE;
   
-  return FALSE;
+    gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
+      
+    return FALSE;
 }
 
 //-----------------------------------------------------------------------------
@@ -105,173 +132,181 @@ 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_needParent = TRUE;
+    m_acceptsFocus = TRUE;
   
-  PreCreation( parent, id, pos, size, style, name );
+    PreCreation( parent, id, pos, size, style, name );
   
-  SetValidator( validator );
+    SetValidator( validator );
 
-  m_oldPos = 0.0;
+    m_oldPos = 0.0;
 
-  if (style & wxSB_VERTICAL == wxSB_VERTICAL)
-    m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL );
-  else
-    m_widget = gtk_vscrollbar_new( (GtkAdjustment *) NULL );
+    if (style & wxSB_VERTICAL == wxSB_VERTICAL)
+        m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL );
+    else
+        m_widget = gtk_vscrollbar_new( (GtkAdjustment *) NULL );
     
-  m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
+    m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
   
-  gtk_signal_connect (GTK_OBJECT (m_adjust), "value_changed",
-		      (GtkSignalFunc) gtk_scrollbar_callback, (gpointer) this );
+    gtk_signal_connect( GTK_OBJECT(m_adjust), 
+                        "value_changed",
+		        (GtkSignalFunc) gtk_scrollbar_callback, 
+			(gpointer) this );
   
-  gtk_signal_connect( GTK_OBJECT(m_widget), "button_press_event",
-          (GtkSignalFunc)gtk_scrollbar_button_press_callback, (gpointer) this );
+    gtk_signal_connect( GTK_OBJECT(m_widget), 
+                        "button_press_event",
+                        (GtkSignalFunc)gtk_scrollbar_button_press_callback, 
+			(gpointer) this );
 
-  gtk_signal_connect( GTK_OBJECT(m_widget), "button_release_event",
-          (GtkSignalFunc)gtk_scrollbar_button_release_callback, (gpointer) this );
+    gtk_signal_connect( GTK_OBJECT(m_widget), 
+                        "button_release_event",
+                        (GtkSignalFunc)gtk_scrollbar_button_release_callback, 
+		        (gpointer) this );
 
-  m_parent->AddChild( this );
+    m_parent->AddChild( this );
 
-  (m_parent->m_insertCallback)( m_parent, this );
+    (m_parent->m_insertCallback)( m_parent, this );
   
-  PostCreation();
+    PostCreation();
   
-  SetBackgroundColour( parent->GetBackgroundColour() );
+    SetBackgroundColour( parent->GetBackgroundColour() );
 
-  Show( TRUE );
+    Show( TRUE );
     
-  return TRUE;
+    return TRUE;
 }
 
-int wxScrollBar::GetPosition(void) const
+int wxScrollBar::GetThumbPosition(void) const
 {
-  return (int)(m_adjust->value+0.5);
+    return (int)(m_adjust->value+0.5);
 }
 
 int wxScrollBar::GetThumbSize() const
 {
-  return (int)(m_adjust->page_size+0.5);
+    return (int)(m_adjust->page_size+0.5);
 }
 
 int wxScrollBar::GetPageSize() const
 {
-  return (int)(m_adjust->page_increment+0.5);
+    return (int)(m_adjust->page_increment+0.5);
 }
 
 int wxScrollBar::GetRange() const
 {
-  return (int)(m_adjust->upper+0.5);
+    return (int)(m_adjust->upper+0.5);
 }
 
-void wxScrollBar::SetPosition( int viewStart )
+void wxScrollBar::SetThumbPosition( int viewStart )
 {
-  float fpos = (float)viewStart;
-  m_oldPos = fpos;
-  if (fabs(fpos-m_adjust->value) < 0.2) return;
-  m_adjust->value = fpos;
-
-  if (!m_isScrolling)
+    if (m_isScrolling) return;
+  
+    float fpos = (float)viewStart;
+    m_oldPos = fpos;
+    if (fabs(fpos-m_adjust->value) < 0.2) return;
+    m_adjust->value = fpos;
+  
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
 }
 
 void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize,
       bool WXUNUSED(refresh) )
 {
-  float fpos = (float)position;
-  float frange = (float)range;
-  float fthumb = (float)thumbSize;
-  float fpage = (float)pageSize;
+    float fpos = (float)position;
+    float frange = (float)range;
+    float fthumb = (float)thumbSize;
+    float fpage = (float)pageSize;
       
-  if ((fabs(frange-m_adjust->upper) < 0.2) &&
-      (fabs(fthumb-m_adjust->page_size) < 0.2) &&
-      (fabs(fpage-m_adjust->page_increment) < 0.2))
-  {
-    SetPosition( position );
-    return;
-  }
+    if ((fabs(frange-m_adjust->upper) < 0.2) &&
+        (fabs(fthumb-m_adjust->page_size) < 0.2) &&
+        (fabs(fpage-m_adjust->page_increment) < 0.2))
+    {
+        SetThumbPosition( position );
+        return;
+    }
   
-  m_oldPos = fpos;
+    m_oldPos = fpos;
   
-  m_adjust->lower = 0.0;
-  m_adjust->upper = frange;
-  m_adjust->value = fpos;
-  m_adjust->step_increment = 1.0;
-  m_adjust->page_increment = (float)(wxMax(fpage,0));
-  m_adjust->page_size = fthumb;
-
-  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    m_adjust->lower = 0.0;
+    m_adjust->upper = frange;
+    m_adjust->value = fpos;
+    m_adjust->step_increment = 1.0;
+    m_adjust->page_increment = (float)(wxMax(fpage,0));
+    m_adjust->page_size = fthumb;
+
+    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
 }
 
-// Backward compatibility
+/* Backward compatibility */
 int wxScrollBar::GetValue(void) const
 {
-  return GetPosition();
+    return GetThumbPosition();
 }
 
 void wxScrollBar::SetValue( int viewStart )
 {
-  SetPosition( viewStart );
+    SetThumbPosition( viewStart );
 }
 
 void wxScrollBar::GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength ) const
 {
-  int pos = (int)(m_adjust->value+0.5);
-  int thumb = (int)(m_adjust->page_size+0.5);
-  int page = (int)(m_adjust->page_increment+0.5);
-  int range = (int)(m_adjust->upper+0.5);
+    int pos = (int)(m_adjust->value+0.5);
+    int thumb = (int)(m_adjust->page_size+0.5);
+    int page = (int)(m_adjust->page_increment+0.5);
+    int range = (int)(m_adjust->upper+0.5);
   
-  *viewStart = pos;
-  *viewLength = range;
-  *objectLength = thumb;
-  *pageLength = page;
+    *viewStart = pos;
+    *viewLength = range;
+    *objectLength = thumb;
+    *pageLength = page;
 }
 
 int wxScrollBar::GetViewLength() const
 {
-  return (int)(m_adjust->upper+0.5);
+    return (int)(m_adjust->upper+0.5);
 }
 
 int wxScrollBar::GetObjectLength() const
 {
-  return (int)(m_adjust->page_size+0.5);
+    return (int)(m_adjust->page_size+0.5);
 }
 
 void wxScrollBar::SetPageSize( int pageLength )
 {
-  int pos = (int)(m_adjust->value+0.5);
-  int thumb = (int)(m_adjust->page_size+0.5);
-  int range = (int)(m_adjust->upper+0.5);
-  SetScrollbar( pos, thumb, range, pageLength );
+    int pos = (int)(m_adjust->value+0.5);
+    int thumb = (int)(m_adjust->page_size+0.5);
+    int range = (int)(m_adjust->upper+0.5);
+    SetScrollbar( pos, thumb, range, pageLength );
 }
 
 void wxScrollBar::SetObjectLength( int objectLength )
 {
-  int pos = (int)(m_adjust->value+0.5);
-  int page = (int)(m_adjust->page_increment+0.5);
-  int range = (int)(m_adjust->upper+0.5);
-  SetScrollbar( pos, objectLength, range, page );
+    int pos = (int)(m_adjust->value+0.5);
+    int page = (int)(m_adjust->page_increment+0.5);
+    int range = (int)(m_adjust->upper+0.5);
+    SetScrollbar( pos, objectLength, range, page );
 }
 
 void wxScrollBar::SetViewLength( int viewLength )
 {
-  int pos = (int)(m_adjust->value+0.5);
-  int thumb = (int)(m_adjust->page_size+0.5);
-  int page = (int)(m_adjust->page_increment+0.5);
-  SetScrollbar( pos, thumb, viewLength, page );
+    int pos = (int)(m_adjust->value+0.5);
+    int thumb = (int)(m_adjust->page_size+0.5);
+    int page = (int)(m_adjust->page_increment+0.5);
+    SetScrollbar( pos, thumb, viewLength, page );
 }
 
 bool wxScrollBar::IsOwnGtkWindow( GdkWindow *window )
 {
-  GtkRange *range = GTK_RANGE(m_widget);
-  return ( (window == GTK_WIDGET(range)->window) ||
-           (window == range->trough) ||
-	   (window == range->slider) ||
-	   (window == range->step_forw) ||
-	   (window == range->step_back) );
+    GtkRange *range = GTK_RANGE(m_widget);
+    return ( (window == GTK_WIDGET(range)->window) ||
+             (window == range->trough) ||
+	     (window == range->slider) ||
+	     (window == range->step_forw) ||
+	     (window == range->step_back) );
 }
 
 void wxScrollBar::ApplyWidgetStyle()
 {
-  SetWidgetStyle();
-  gtk_widget_set_style( m_widget, m_widgetStyle );
+    SetWidgetStyle();
+    gtk_widget_set_style( m_widget, m_widgetStyle );
 }