Listctrl updates

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

diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp
index 37396d960552a9eb0c100ea1fac5860fb852cb90..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,15 +14,17 @@
 
 #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;

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxScrollBar
+// "value_changed"

 //-----------------------------------------------------------------------------
 
 static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *win )
 //-----------------------------------------------------------------------------
 
 static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *win )


@@ -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 );


@@ -59,113 +69,159 @@ static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *wi
   cevent.SetEventObject( win );
   win->ProcessEvent( cevent );
 */
   cevent.SetEventObject( win );
   win->ProcessEvent( cevent );
 */

-};
+}

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
+//-----------------------------------------------------------------------------
+// "button_press_event" from slider
+//-----------------------------------------------------------------------------

 
 

-wxScrollBar::wxScrollBar(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos, const wxSize& size,
-           long style, const wxString& name )
+static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget), 
+                                                 GdkEventButton *WXUNUSED(gdk_event), 
+                                                wxScrollBar *win )
+{
+  win->m_isScrolling = TRUE;
+  g_blockEventsOnScroll = TRUE;
+  
+  return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "button_release_event" from slider
+//-----------------------------------------------------------------------------
+
+static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget), 
+                                                   GdkEventButton *WXUNUSED(gdk_event), 
+                                                  wxScrollBar *win )

 {
 {

-  Create( parent, id, pos, size, style, name );
-};
+  win->m_isScrolling = FALSE;
+  g_blockEventsOnScroll = FALSE;
+  
+  gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
+      
+  return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// wxScrollBar
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)

 
 wxScrollBar::~wxScrollBar(void)
 {
 
 wxScrollBar::~wxScrollBar(void)
 {

-};
+}

 
 bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos, const wxSize& size,
 
 bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos, const wxSize& size,

-           long style, const wxString& name )
+           long style, const wxValidator& validator, const wxString& name )

 {
   m_needParent = TRUE;
   
   PreCreation( parent, id, pos, size, style, name );
   
 {
   m_needParent = TRUE;
   
   PreCreation( parent, id, pos, size, style, name );
   

+  SetValidator( validator );
+

   m_oldPos = 0.0;
 
   if (style & wxSB_VERTICAL == wxSB_VERTICAL)
   m_oldPos = 0.0;
 
   if (style & wxSB_VERTICAL == wxSB_VERTICAL)

-    m_widget = gtk_hscrollbar_new( NULL );
+    m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL );

   else
   else

-    m_widget = gtk_vscrollbar_new( NULL );
+    m_widget = gtk_vscrollbar_new( (GtkAdjustment *) NULL );

     
   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 );
   
     
   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_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 );
+
+  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);

-};
+}

 
 int wxScrollBar::GetThumbSize() const
 {
   return (int)(m_adjust->page_size+0.5);
 
 int wxScrollBar::GetThumbSize() const
 {
   return (int)(m_adjust->page_size+0.5);

-};
+}

 
 int wxScrollBar::GetPageSize() const
 {
   return (int)(m_adjust->page_increment+0.5);
 
 int wxScrollBar::GetPageSize() const
 {
   return (int)(m_adjust->page_increment+0.5);

-};
+}

 
 int wxScrollBar::GetRange() const
 {
   return (int)(m_adjust->upper+0.5);
 
 int wxScrollBar::GetRange() const
 {
   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;
   
   gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
   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;
 
 void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize,
       bool WXUNUSED(refresh) )
 {
   float fpos = (float)position;

-  m_oldPos = fpos;

   float frange = (float)range;
   float fthumb = (float)thumbSize;
   float fpage = (float)pageSize;
       
   float frange = (float)range;
   float fthumb = (float)thumbSize;
   float fpage = (float)pageSize;
       

-  if ((fabs(fpos-m_adjust->value) < 0.2) &&
-      (fabs(frange-m_adjust->upper) < 0.2) &&
+  if ((fabs(frange-m_adjust->upper) < 0.2) &&

       (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))

-      return;
-      
+  {
+    SetThumbPosition( position );
+    return;
+  }
+  
+  m_oldPos = fpos;
+  

   m_adjust->lower = 0.0;
   m_adjust->upper = frange;
   m_adjust->value = fpos;
   m_adjust->step_increment = 1.0;
   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" );

-};
+}

 
 // 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
 {


@@ -178,17 +234,17 @@ void wxScrollBar::GetValues( int *viewStart, int *viewLength, int *objectLength,
   *viewLength = range;
   *objectLength = thumb;
   *pageLength = page;
   *viewLength = range;
   *objectLength = thumb;
   *pageLength = page;

-};
+}

 
 int wxScrollBar::GetViewLength() const
 {
   return (int)(m_adjust->upper+0.5);
 
 int wxScrollBar::GetViewLength() const
 {
   return (int)(m_adjust->upper+0.5);

-};
+}

 
 int wxScrollBar::GetObjectLength() const
 {
   return (int)(m_adjust->page_size+0.5);
 
 int wxScrollBar::GetObjectLength() const
 {
   return (int)(m_adjust->page_size+0.5);

-};
+}

 
 void wxScrollBar::SetPageSize( int pageLength )
 {
 
 void wxScrollBar::SetPageSize( int pageLength )
 {


@@ -196,7 +252,7 @@ void wxScrollBar::SetPageSize( int pageLength )
   int thumb = (int)(m_adjust->page_size+0.5);
   int range = (int)(m_adjust->upper+0.5);
   SetScrollbar( pos, thumb, range, pageLength );
   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 )
 {
 
 void wxScrollBar::SetObjectLength( int objectLength )
 {


@@ -204,7 +260,7 @@ void wxScrollBar::SetObjectLength( int objectLength )
   int page = (int)(m_adjust->page_increment+0.5);
   int range = (int)(m_adjust->upper+0.5);
   SetScrollbar( pos, objectLength, range, page );
   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 )
 {
 
 void wxScrollBar::SetViewLength( int viewLength )
 {


@@ -212,5 +268,21 @@ void wxScrollBar::SetViewLength( int viewLength )
   int thumb = (int)(m_adjust->page_size+0.5);
   int page = (int)(m_adjust->page_increment+0.5);
   SetScrollbar( pos, thumb, viewLength, page );
   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) );
+}
+
+void wxScrollBar::ApplyWidgetStyle()
+{
+  SetWidgetStyle();
+  gtk_widget_set_style( m_widget, m_widgetStyle );
+}