X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88413fec06d896eb4499b7e2ecf7940b15ea9175..87df17a11b0017d31c09f767bd921abb27193bee:/src/gtk/scrolbar.cpp?ds=sidebyside

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index 5aa22195f8..a165b0c8d2 100644
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -63,7 +63,8 @@ static void gtk_scrollbar_callback( GtkAdjustment *adjust, wxScrollBar *win )
     else if (range->scroll_type == GTK_SCROLL_PAGE_BACKWARD) command = wxEVT_SCROLL_PAGEUP;
     else if (range->scroll_type == GTK_SCROLL_PAGE_FORWARD)  command = wxEVT_SCROLL_PAGEDOWN;
     
-    int value = (int)ceil(adjust->value);
+    double dvalue = adjust->value;
+    int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);
       
     int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
   
@@ -82,14 +83,15 @@ static void gtk_scrollbar_callback( GtkAdjustment *adjust, wxScrollBar *win )
 // "button_press_event" from slider
 //-----------------------------------------------------------------------------
 
-static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget), 
-                                                 GdkEventButton *WXUNUSED(gdk_event), 
+static gint gtk_scrollbar_button_press_callback( GtkRange *widget, 
+                                                 GdkEventButton *gdk_event, 
                                                  wxScrollBar *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
-    win->m_isScrolling = TRUE;
 //  g_blockEventsOnScroll = TRUE;  doesn't work in DialogEd
+
+    win->m_isScrolling = (gdk_event->window == widget->slider);
   
     return FALSE;
 }
@@ -104,20 +106,21 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
 {
     if (g_isIdle) wxapp_install_idle_handler();
     
-    wxASSERT( win->m_isScrolling );
-
-    win->m_isScrolling = FALSE;
 //  g_blockEventsOnScroll = FALSE;
   
-    wxEventType command = wxEVT_SCROLL_THUMBTRACK;
-    int value = (int)ceil(win->m_adjust->value);
-    int dir = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
+    if (win->m_isScrolling)
+    {
+        wxEventType command = wxEVT_SCROLL_THUMBRELEASE;
+        int value = (int)ceil(win->m_adjust->value);
+        int dir = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
 
-    wxScrollEvent event( command, value, dir );
-    event.SetScrolling( FALSE );
-    event.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent( event );
+        wxScrollEvent event( command, value, dir );
+        event.SetEventObject( win );
+        win->GetEventHandler()->ProcessEvent( event );
+    }
       
+    win->m_isScrolling = FALSE;
+    
     return FALSE;
 }
 
@@ -127,7 +130,7 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
 
-wxScrollBar::~wxScrollBar(void)
+wxScrollBar::~wxScrollBar()
 {
 }
 
@@ -142,7 +145,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxScrollBar creation failed") );
-	return FALSE;
+        return FALSE;
     }
 
     m_oldPos = 0.0;
@@ -180,9 +183,10 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
     return TRUE;
 }
 
-int wxScrollBar::GetThumbPosition(void) const
+int wxScrollBar::GetThumbPosition() const
 {
-    return (int)(m_adjust->value+0.5);
+    double val = m_adjust->value;
+    return (int)(val < 0 ? val - 0.5 : val + 0.5);
 }
 
 int wxScrollBar::GetThumbSize() const
@@ -209,7 +213,16 @@ void wxScrollBar::SetThumbPosition( int viewStart )
     if (fabs(fpos-m_adjust->value) < 0.2) return;
     m_adjust->value = fpos;
   
+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_adjust), 
+                        (GtkSignalFunc) gtk_scrollbar_callback, 
+                        (gpointer) this );
+                        
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+    
+    gtk_signal_connect( GTK_OBJECT(m_adjust), 
+                        "value_changed",
+                        (GtkSignalFunc) gtk_scrollbar_callback, 
+                        (gpointer) this );
 }
 
 void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize,
@@ -241,7 +254,7 @@ void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int page
 }
 
 /* Backward compatibility */
-int wxScrollBar::GetValue(void) const
+int wxScrollBar::GetValue() const
 {
     return GetThumbPosition();
 }