Listctrl updates

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

diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp
index 0cd5adbd318b61917b9f0e6852d9cf2965d8efba..32a9168bc2f4f2b420d6cd854009a82e549bdd45 100644 (file)
--- a/src/gtk1/scrolbar.cpp
+++ b/src/gtk1/scrolbar.cpp
@@ -14,12 +14,14 @@
 
 #include "wx/scrolbar.h"
 #include "wx/utils.h"
 
 #include "wx/scrolbar.h"
 #include "wx/utils.h"

+#include <math.h>

 
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 
 extern bool   g_blockEventsOnDrag;

+extern bool   g_blockEventsOnScroll;

 
 //-----------------------------------------------------------------------------
 // "value_changed"
 
 //-----------------------------------------------------------------------------
 // "value_changed"


@@ -38,11 +40,20 @@ static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *wi
   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(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;
+  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 value = (int)(win->m_adjust->value+0.5);
       


@@ -64,11 +75,12 @@ static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *wi
 // "button_press_event" from slider
 //-----------------------------------------------------------------------------
 
 // "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;
   win->m_isScrolling = TRUE;

+  g_blockEventsOnScroll = TRUE;

   
   return FALSE;
 }
   
   return FALSE;
 }


@@ -77,14 +89,15 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *widget, GdkEventButto
 // "button_release_event" from slider
 //-----------------------------------------------------------------------------
 
 // "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;
-
-  gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
-      

   win->m_isScrolling = FALSE;
   win->m_isScrolling = FALSE;

+  g_blockEventsOnScroll = FALSE;

   
   

+  gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
+      

   return FALSE;
 }
 
   return FALSE;
 }
 


@@ -139,7 +152,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
   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);
 }


@@ -159,15 +172,16 @@ 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 )

 {
 {

+  if (m_isScrolling) return;
+  

   float fpos = (float)viewStart;
   m_oldPos = fpos;
   if (fabs(fpos-m_adjust->value) < 0.2) return;
   m_adjust->value = fpos;
   float fpos = (float)viewStart;
   m_oldPos = fpos;
   if (fabs(fpos-m_adjust->value) < 0.2) return;
   m_adjust->value = fpos;

-
-  if (!m_isScrolling)
-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+  
+  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );

 }
 
 void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize,
 }
 
 void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize,


@@ -182,7 +196,7 @@ void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int page
       (fabs(fthumb-m_adjust->page_size) < 0.2) &&
       (fabs(fpage-m_adjust->page_increment) < 0.2))
   {
       (fabs(fthumb-m_adjust->page_size) < 0.2) &&
       (fabs(fpage-m_adjust->page_increment) < 0.2))
   {

-    SetPosition( position );
+    SetThumbPosition( position );

     return;
   }
   
     return;
   }
   


@@ -201,12 +215,12 @@ void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int page
 // Backward compatibility
 int wxScrollBar::GetValue(void) const
 {
 // Backward compatibility
 int wxScrollBar::GetValue(void) const
 {

-  return GetPosition();
+  return GetThumbPosition();

 }
 
 void wxScrollBar::SetValue( int viewStart )
 {
 }
 
 void wxScrollBar::SetValue( int viewStart )
 {

-  SetPosition( viewStart );
+  SetThumbPosition( viewStart );

 }
 
 void wxScrollBar::GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength ) const
 }
 
 void wxScrollBar::GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength ) const