Further sorting work using the sorting data model.

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

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index 6fd20ff176e28a0824a981341341afaa532f5afd..3a44d755f05e2c5f8cf49d593dd0358904e4b5c2 100644 (file)
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -1,23 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        scrolbar.cpp
+// Name:        src/gtk/scrolbar.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:           wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-#ifdef __GNUG__
-#pragma implementation "scrolbar.h"
-#endif
+#if wxUSE_SCROLLBAR

 
 #include "wx/scrolbar.h"
 
 #include "wx/scrolbar.h"

-#include "wx/utils.h"
-#include <math.h>

 
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/utils.h"
+#include "wx/math.h"
+#include "wx/gtk/private.h"

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -31,91 +30,129 @@ extern bool g_isIdle;
 //-----------------------------------------------------------------------------
 
 extern bool   g_blockEventsOnDrag;
 //-----------------------------------------------------------------------------
 
 extern bool   g_blockEventsOnDrag;

-extern bool   g_blockEventsOnScroll;
+static wxEventType g_currentUpDownEvent = wxEVT_NULL;
+
+static const float sensitivity = 0.02;

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

-static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *win )
-{ 
+// FIXME: is GtkScrollType really passed to us as 2nd argument?
+
+extern "C" {
+static void gtk_scrollbar_callback( GtkAdjustment *adjust,
+                                    wxScrollBar *win )
+{

     if (g_isIdle) wxapp_install_idle_handler();
 
     if (g_isIdle) wxapp_install_idle_handler();
 

-    if (!win->HasVMT()) return;
+    if (!win->m_hasVMT) return;

     if (g_blockEventsOnDrag) return;
     if (g_blockEventsOnDrag) 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;
-  
-    float line_step = win->m_adjust->step_increment;
-    float page_step = win->m_adjust->page_increment;
-  
-    if (win->IsScrolling())
-    {
-        command = wxEVT_SCROLL_THUMBTRACK;
-    }
-    else
+
+    float diff = adjust->value - win->m_oldPos;
+    if (fabs(diff) < sensitivity) return;
+
+    win->m_oldPos = adjust->value;
+
+    wxEventType command = GtkScrollTypeToWx(GTK_SCROLL_JUMP);
+
+    double dvalue = adjust->value;
+    int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);
+
+    int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
+
+    // throw a LINEUP / LINEDOWN event if necessary
+    if (g_currentUpDownEvent != wxEVT_NULL)

     {
     {

-        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;
+        wxScrollEvent event( g_currentUpDownEvent, win->GetId(), value, orient );
+        event.SetEventObject( win );
+        win->GetEventHandler()->ProcessEvent( event );

     }
 
     }
 

-    int value = (int)(win->m_adjust->value+0.5);
-      
-    int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
-  
+    // throw other event (wxEVT_SCROLL_THUMBTRACK)

     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 );
 */
 }

+}

 
 //-----------------------------------------------------------------------------
 // "button_press_event" from slider
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // "button_press_event" from slider
 //-----------------------------------------------------------------------------

-
-static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget), 
-                                                 GdkEventButton *WXUNUSED(gdk_event), 
+extern "C" {
+static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
+                                                 GdkEventButton *gdk_event,

                                                  wxScrollBar *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
                                                  wxScrollBar *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 

-    win->SetScrolling(TRUE);
-//  g_blockEventsOnScroll = TRUE;  doesn't work in DialogEd
-  
+    // check if a LINEUP/LINEDOWN event must be thrown
+    // I suppose here the size of scrollbar top/bottom buttons is 16px height
+    if (gdk_event->type == GDK_BUTTON_PRESS && gdk_event->button == 1)
+    {
+        int scroll_height, mouse_pos;
+
+        // get the mouse position when the click is done
+        if (win->HasFlag(wxSB_VERTICAL))
+        {
+            scroll_height = GTK_WIDGET(widget)->allocation.height - 16;
+            mouse_pos = (int)gdk_event->y;
+        }
+        else
+        {
+            scroll_height = GTK_WIDGET(widget)->allocation.width - 16;
+            mouse_pos = (int)gdk_event->x;
+        }
+
+        // compare mouse position to scrollbar height
+        if  (mouse_pos > scroll_height)
+            g_currentUpDownEvent = wxEVT_SCROLL_LINEDOWN;
+        else if (mouse_pos < 16)
+            g_currentUpDownEvent = wxEVT_SCROLL_LINEUP;
+      }
+

     return FALSE;
 }
     return FALSE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // "button_release_event" from slider
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "button_release_event" from slider
 //-----------------------------------------------------------------------------
 

-static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget), 
-                                                   GdkEventButton *WXUNUSED(gdk_event), 
-                                                   wxScrollBar *win )
+extern "C" {
+static gint
+gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
+                                       GdkEventButton *WXUNUSED(gdk_event),
+                                       wxScrollBar *win )

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    if (win->m_isScrolling)
+    {
+        wxEventType command = wxEVT_SCROLL_THUMBRELEASE;
+        int value = (int)ceil(win->m_adjust->value);
+        int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
+
+        wxScrollEvent event( command, win->GetId(), value, orient );
+        event.SetEventObject( win );
+        win->GetEventHandler()->ProcessEvent( event );
+    }
+
+    win->m_isScrolling = false;
+
+    // reset the LINEUP/LINEDOWN flag when the mouse button is released
+    g_currentUpDownEvent = wxEVT_NULL;

 
 

-    win->SetScrolling(FALSE);
-//  g_blockEventsOnScroll = FALSE;
-  
-    gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
-      

     return FALSE;
 }
     return FALSE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // wxScrollBar
 
 //-----------------------------------------------------------------------------
 // wxScrollBar


@@ -123,7 +160,7 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
 

-wxScrollBar::~wxScrollBar(void)
+wxScrollBar::~wxScrollBar()

 {
 }
 
 {
 }
 


@@ -131,51 +168,49 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos, const wxSize& size,
            long style, const wxValidator& validator, const wxString& name )
 {
            const wxPoint& pos, const wxSize& size,
            long style, const wxValidator& validator, const wxString& name )
 {

-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
-  
-    PreCreation( parent, id, pos, size, style, name );
-  
-    SetValidator( validator );
+    m_needParent = true;
+    m_acceptsFocus = true;
+
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxScrollBar creation failed") );
+        return false;
+    }

 
     m_oldPos = 0.0;
 
 
     m_oldPos = 0.0;
 

-    if (style & wxSB_VERTICAL == wxSB_VERTICAL)
-        m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL );
-    else
+    if ((style & wxSB_VERTICAL) == wxSB_VERTICAL)

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

-    
+    else
+        m_widget = gtk_hscrollbar_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_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 );
+    if ( style & wxSB_VERTICAL )
+    {
+        SetVScrollAdjustment(m_adjust);
+    }
+
+    g_signal_connect (m_adjust, "value_changed",
+                      G_CALLBACK (gtk_scrollbar_callback), this);
+    g_signal_connect (m_widget, "button_press_event",
+                      G_CALLBACK (gtk_scrollbar_button_press_callback),
+                      this);
+    g_signal_connect (m_widget, "button_release_event",
+                      G_CALLBACK (gtk_scrollbar_button_release_callback),
+                      this);

 
     m_parent->DoAddChild( this );
 
     m_parent->DoAddChild( this );

-  
-    PostCreation();
-  
-    SetBackgroundColour( parent->GetBackgroundColour() );
-
-    Show( TRUE );
-    
-    return TRUE;
+
+    PostCreation(size);
+
+    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
 }
 
 int wxScrollBar::GetThumbSize() const


@@ -196,13 +231,20 @@ int wxScrollBar::GetRange() const
 void wxScrollBar::SetThumbPosition( int viewStart )
 {
     if (m_isScrolling) return;
 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;

-  
-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+
+    g_signal_handlers_disconnect_by_func (m_adjust,
+                                          (gpointer) gtk_scrollbar_callback,
+                                          this);
+
+    g_signal_emit_by_name (m_adjust, "value_changed");
+
+    g_signal_connect (m_adjust, "value_changed",
+                      G_CALLBACK (gtk_scrollbar_callback), this);

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


@@ -212,7 +254,7 @@ void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int page
     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(frange-m_adjust->upper) < 0.2) &&
         (fabs(fthumb-m_adjust->page_size) < 0.2) &&
         (fabs(fpage-m_adjust->page_increment) < 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))


@@ -220,9 +262,9 @@ void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int page
         SetThumbPosition( position );
         return;
     }
         SetThumbPosition( position );
         return;
     }

-  
+

     m_oldPos = fpos;
     m_oldPos = fpos;

-  
+

     m_adjust->lower = 0.0;
     m_adjust->upper = frange;
     m_adjust->value = fpos;
     m_adjust->lower = 0.0;
     m_adjust->upper = frange;
     m_adjust->value = fpos;


@@ -230,11 +272,11 @@ void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int page
     m_adjust->page_increment = (float)(wxMax(fpage,0));
     m_adjust->page_size = fthumb;
 
     m_adjust->page_increment = (float)(wxMax(fpage,0));
     m_adjust->page_size = fthumb;
 

-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    g_signal_emit_by_name (m_adjust, "changed");

 }
 
 /* Backward compatibility */
 }
 
 /* Backward compatibility */

-int wxScrollBar::GetValue(void) const
+int wxScrollBar::GetValue() const

 {
     return GetThumbPosition();
 }
 {
     return GetThumbPosition();
 }


@@ -250,7 +292,7 @@ void wxScrollBar::GetValues( int *viewStart, int *viewLength, int *objectLength,
     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 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;
     *viewStart = pos;
     *viewLength = range;
     *objectLength = thumb;


@@ -294,16 +336,19 @@ void wxScrollBar::SetViewLength( int viewLength )
 bool wxScrollBar::IsOwnGtkWindow( GdkWindow *window )
 {
     GtkRange *range = GTK_RANGE(m_widget);
 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) );
+    return ( (window == GTK_WIDGET(range)->window) );

 }
 
 }
 

-void wxScrollBar::ApplyWidgetStyle()
+wxSize wxScrollBar::DoGetBestSize() const

 {
 {

-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+    return wxControl::DoGetBestSize();

 }
 
 }
 

+// static
+wxVisualAttributes
+wxScrollBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_vscrollbar_new);
+}
+
+#endif