Add wxControlWithItems::SendSelectionChangedEvent() helper.

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

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index 46ebc7ca4def9c2ec92fdc582a09a8442dd12e32..bce25d596799490bb87e3227917e555e2725360e 100644 (file)
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -4,14 +4,9 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

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

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

-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "scrolbar.h"
-#endif
-

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


@@ -19,121 +14,113 @@
 
 #include "wx/scrolbar.h"
 
 
 #include "wx/scrolbar.h"
 

-#include "wx/utils.h"
-
-#include <math.h>
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif

 
 #include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------
 
 #include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------

-// idle system
+// "value_changed" from scrollbar

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

-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
-
-extern bool   g_blockEventsOnDrag;
-extern bool   g_blockEventsOnScroll;
-
-static const float sensitivity = 0.02;
+extern "C" {
+static void
+gtk_value_changed(GtkRange* range, wxScrollBar* win)
+{
+    wxEventType eventType = win->GTKGetScrollEventType(range);
+    if (eventType != wxEVT_NULL)
+    {
+        const int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
+        const int value = win->GetThumbPosition();
+        const int id = win->GetId();
+
+        // first send the specific event for the user action
+        wxScrollEvent evtSpec(eventType, id, value, orient);
+        evtSpec.SetEventObject(win);
+        win->HandleWindowEvent(evtSpec);
+
+        if (!win->m_isScrolling)
+        {
+            // and if it's over also send a general "changed" event
+            wxScrollEvent evtChanged(wxEVT_SCROLL_CHANGED, id, value, orient);
+            evtChanged.SetEventObject(win);
+            win->HandleWindowEvent(evtChanged);
+        }
+    }
+}
+}

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

-// "value_changed"
+// "button_press_event" from scrollbar

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

-// FIXME: is GtkScrollType really passed to us as 2nd argument?
-
-static void gtk_scrollbar_callback( GtkAdjustment *adjust,
-                                    SCROLLBAR_CBACK_ARG
-                                    wxScrollBar *win )
+extern "C" {
+static gboolean
+gtk_button_press_event(GtkRange*, GdkEventButton*, wxScrollBar* win)

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!win->m_hasVMT) return;
-    if (g_blockEventsOnDrag) return;
-
-    float diff = adjust->value - win->m_oldPos;
-    if (fabs(diff) < sensitivity) return;
-
-    win->m_oldPos = adjust->value;
-
-    wxEventType command = GtkScrollTypeToWx(GET_SCROLL_TYPE(win->m_widget));
-
-    double dvalue = adjust->value;
-    int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);
-
-    int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
-
-    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 );
-*/
+    win->m_mouseButtonDown = true;
+    return false;
+}

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// "button_press_event" from slider
+// "event_after" from scrollbar

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

-static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
-                                                 GdkEventButton *gdk_event,
-                                                 wxScrollBar *win )
+extern "C" {
+static void
+gtk_event_after(GtkRange* range, GdkEvent* event, wxScrollBar* win)

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
+    if (event->type == GDK_BUTTON_RELEASE)
+    {
+        g_signal_handlers_block_by_func(range, (void*)gtk_event_after, win);

 
 

-//  g_blockEventsOnScroll = TRUE;  doesn't work in DialogEd
+        const int value = win->GetThumbPosition();
+        const int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
+        const int id = win->GetId();

 
 

-    // FIXME: there is no slider field any more, what was meant here?
-#ifndef __WXGTK20__
-    win->m_isScrolling = (gdk_event->window == widget->slider);
-#endif
+        wxScrollEvent evtRel(wxEVT_SCROLL_THUMBRELEASE, id, value, orient);
+        evtRel.SetEventObject(win);
+        win->HandleWindowEvent(evtRel);

 
 

-    return FALSE;
+        wxScrollEvent evtChanged(wxEVT_SCROLL_CHANGED, id, value, orient);
+        evtChanged.SetEventObject(win);
+        win->HandleWindowEvent(evtChanged);
+    }
+}

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// "button_release_event" from slider
+// "button_release_event" from scrollbar

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

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

 {
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
-//  g_blockEventsOnScroll = FALSE;
-
+    win->m_mouseButtonDown = false;
+    // If thumb tracking

     if (win->m_isScrolling)
     {
     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;
+        // Hook up handler to send thumb release event after this emission is finished.
+        // To allow setting scroll position from event handler, sending event must
+        // be deferred until after the GtkRange handler for this signal has run
+        g_signal_handlers_unblock_by_func(range, (void*)gtk_event_after, win);

     }
 
     }
 

-    win->m_isScrolling = FALSE;
-
-    return FALSE;
+    return false;
+}

 }
 
 //-----------------------------------------------------------------------------
 // wxScrollBar
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // wxScrollBar
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
+wxScrollBar::wxScrollBar()
+{
+}

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


@@ -143,204 +130,109 @@ 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;
-

     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxScrollBar creation failed") );
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxScrollBar creation failed") );

-        return FALSE;
+        return false;

     }
 
     }
 

-    m_oldPos = 0.0;
+    const bool isVertical = (style & wxSB_VERTICAL) != 0;
+    m_widget = gtk_scrollbar_new(GtkOrientation(isVertical), NULL);
+    g_object_ref(m_widget);

 
 

-    if ((style & wxSB_VERTICAL) == wxSB_VERTICAL)
-        m_widget = gtk_vscrollbar_new( (GtkAdjustment *) NULL );
-    else
-        m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL );
+    m_scrollBar[0] = (GtkRange*)m_widget;

 
 

-    m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
+    g_signal_connect_after(m_widget, "value_changed",
+                     G_CALLBACK(gtk_value_changed), this);
+    g_signal_connect(m_widget, "button_press_event",
+                     G_CALLBACK(gtk_button_press_event), this);
+    g_signal_connect(m_widget, "button_release_event",
+                     G_CALLBACK(gtk_button_release_event), this);

 
 

-    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 );
+    gulong handler_id;
+    handler_id = g_signal_connect(
+        m_widget, "event_after", G_CALLBACK(gtk_event_after), this);
+    g_signal_handler_block(m_widget, handler_id);

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

-    return TRUE;
+    return true;

 }
 
 int wxScrollBar::GetThumbPosition() const
 {
 }
 
 int wxScrollBar::GetThumbPosition() const
 {

-    double val = m_adjust->value;
-    return (int)(val < 0 ? val - 0.5 : val + 0.5);
+    return wxRound(gtk_range_get_value(GTK_RANGE(m_widget)));

 }
 
 int wxScrollBar::GetThumbSize() const
 {
 }
 
 int wxScrollBar::GetThumbSize() const
 {

-    return (int)(m_adjust->page_size+0.5);
+    GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(m_widget));
+    return int(gtk_adjustment_get_page_size(adj));

 }
 
 int wxScrollBar::GetPageSize() const
 {
 }
 
 int wxScrollBar::GetPageSize() const
 {

-    return (int)(m_adjust->page_increment+0.5);
+    GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(m_widget));
+    return int(gtk_adjustment_get_page_increment(adj));

 }
 
 int wxScrollBar::GetRange() const
 {
 }
 
 int wxScrollBar::GetRange() const
 {

-    return (int)(m_adjust->upper+0.5);
+    GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(m_widget));
+    return int(gtk_adjustment_get_upper(adj));

 }
 
 void wxScrollBar::SetThumbPosition( 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_disconnect_by_func( GTK_OBJECT(m_adjust),
-                        (GtkSignalFunc) gtk_scrollbar_callback,
-                        (gpointer) this );
+    if (GetThumbPosition() != viewStart)
+    {
+        g_signal_handlers_block_by_func(m_widget,
+            (gpointer)gtk_value_changed, this);

 
 

-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+        gtk_range_set_value((GtkRange*)m_widget, viewStart);
+        m_scrollPos[0] = gtk_range_get_value((GtkRange*)m_widget);

 
 

-    gtk_signal_connect( GTK_OBJECT(m_adjust),
-                        "value_changed",
-                        (GtkSignalFunc) gtk_scrollbar_callback,
-                        (gpointer) this );
+        g_signal_handlers_unblock_by_func(m_widget,
+            (gpointer)gtk_value_changed, this);
+    }

 }
 
 }
 

-void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize,
-      bool WXUNUSED(refresh) )
+void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize, bool)

 {
 {

-    float fpos = (float)position;
-    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 (range == 0)

     {
     {

-        SetThumbPosition( position );
-        return;
+        // GtkRange requires upper > lower
+        range =
+        thumbSize = 1;

     }
     }

-
-    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,0));
-    m_adjust->page_size = fthumb;
-
-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
-}
-
-/* Backward compatibility */
-int wxScrollBar::GetValue() const
-{
-    return GetThumbPosition();
-}
-
-void wxScrollBar::SetValue( int viewStart )
-{
-    SetThumbPosition( viewStart );
-}
-
-void wxScrollBar::GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength ) const
-{
-    int pos = (int)(m_adjust->value+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;
-    *pageLength = page;
-}
-
-int wxScrollBar::GetViewLength() const
-{
-    return (int)(m_adjust->upper+0.5);
-}
-
-int wxScrollBar::GetObjectLength() const
-{
-    return (int)(m_adjust->page_size+0.5);
+    g_signal_handlers_block_by_func(m_widget, (void*)gtk_value_changed, this);
+    GtkRange* widget = GTK_RANGE(m_widget);
+    gtk_adjustment_set_page_size(gtk_range_get_adjustment(widget), thumbSize);
+    gtk_range_set_increments(widget, 1, pageSize);
+    gtk_range_set_range(widget, 0, range);
+    gtk_range_set_value(widget, position);
+    m_scrollPos[0] = gtk_range_get_value(widget);
+    g_signal_handlers_unblock_by_func(m_widget, (void*)gtk_value_changed, this);

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

-    int pos = (int)(m_adjust->value+0.5);
-    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 )
-{
-    int pos = (int)(m_adjust->value+0.5);
-    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 )
-{
-    int pos = (int)(m_adjust->value+0.5);
-    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)
-#ifndef __WXGTK20__
-                || (window == range->trough)
-                || (window == range->slider)
-                || (window == range->step_forw)
-                || (window == range->step_back)
-#endif // GTK+ 1.x
-           );
+    SetScrollbar(GetThumbPosition(), GetThumbSize(), GetRange(), pageLength);

 }
 
 }
 

-void wxScrollBar::ApplyWidgetStyle()
+void wxScrollBar::SetRange(int range)

 {
 {

-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
-}
-
-wxSize wxScrollBar::DoGetBestSize() const
-{
-    return wxControl::DoGetBestSize();
+    SetScrollbar(GetThumbPosition(), GetThumbSize(), range, GetPageSize());

 }
 
 // static
 wxVisualAttributes
 wxScrollBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
 }
 
 // static
 wxVisualAttributes
 wxScrollBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {

-    return GetDefaultAttributesFromGTKWidget(gtk_vscrollbar_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, NULL));

 }
 
 }
 

-#endif
+#endif // wxUSE_SCROLLBAR