Listctrl updates

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

diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp
index c8bc130f5cd98ccd1f7f6582b5ecb80c494e618a..32a9168bc2f4f2b420d6cd854009a82e549bdd45 100644 (file)
--- a/src/gtk1/scrolbar.cpp
+++ b/src/gtk1/scrolbar.cpp
@@ -2,9 +2,8 @@
 // Name:        scrolbar.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        scrolbar.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -15,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"


@@ -39,16 +40,25 @@ 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 orient = wxHORIZONTAL;
 
   int value = (int)(win->m_adjust->value+0.5);
       
   int orient = wxHORIZONTAL;

-  if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxHORIZONTAL;
+  if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;

   
   wxScrollEvent event( command, win->GetId(), value, orient );
   event.SetEventObject( win );
   
   wxScrollEvent event( command, win->GetId(), value, orient );
   event.SetEventObject( win );


@@ -65,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;
 }


@@ -78,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;
 }
 


@@ -127,14 +139,20 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
   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->m_insertCallback)( m_parent, this );
+  

   PostCreation();
   
   PostCreation();
   

+  SetBackgroundColour( parent->GetBackgroundColour() );
+

   Show( TRUE );
     
   return TRUE;
 }
 
   Show( 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);
 }


@@ -154,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,


@@ -177,17 +196,17 @@ 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;
   }

-      
+  

   m_oldPos = fpos;
   
   m_adjust->lower = 0.0;
   m_adjust->upper = frange;
   m_adjust->value = fpos;
   m_adjust->step_increment = 1.0;
   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-2,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->page_size = fthumb;
 
   gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );


@@ -196,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


@@ -260,3 +279,10 @@ bool wxScrollBar::IsOwnGtkWindow( GdkWindow *window )
           (window == range->step_forw) ||
           (window == range->step_back) );
 }
           (window == range->step_forw) ||
           (window == range->step_back) );
 }

+
+void wxScrollBar::ApplyWidgetStyle()
+{
+  SetWidgetStyle();
+  gtk_widget_set_style( m_widget, m_widgetStyle );
+}
+