don't assign the returned value in wxMDIParentFrame::OnCreateClient() to any member...

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

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index 6fd20ff176e28a0824a981341341afaa532f5afd..413e8fbe3c5f5bf2bb9708d8c215fd80e66a06a2 100644 (file)
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -1,120 +1,117 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 
 

-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif

 
 

-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+#include "wx/gtk/private.h"

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

-// data
+// "value_changed" from scrollbar

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

-extern bool   g_blockEventsOnDrag;
-extern bool   g_blockEventsOnScroll;
+extern "C" {
+static void
+gtk_value_changed(GtkRange* range, wxScrollBar* win)
+{
+    wxEventType eventType = win->GetScrollEventType(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

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

-static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *win )
-{ 
-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!win->HasVMT()) 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
-    {
-        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 = 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 );
-*/
+extern "C" {
+static gboolean
+gtk_button_press_event(GtkRange*, GdkEventButton*, wxScrollBar* win)
+{
+    win->m_mouseButtonDown = true;
+    return false;
+}

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

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

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

-static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget), 
-                                                 GdkEventButton *WXUNUSED(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);
+
+        const int value = win->GetThumbPosition();
+        const int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
+        const int id = win->GetId();

 
 

-    win->SetScrolling(TRUE);
-//  g_blockEventsOnScroll = TRUE;  doesn't work in DialogEd
-  
-    return FALSE;
+        wxScrollEvent evtRel(wxEVT_SCROLL_THUMBRELEASE, id, value, orient);
+        evtRel.SetEventObject(win);
+        win->HandleWindowEvent(evtRel);
+
+        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();
-
-    win->SetScrolling(FALSE);
-//  g_blockEventsOnScroll = FALSE;
-  
-    gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
-      
-    return FALSE;
+    win->m_mouseButtonDown = false;
+    // If thumb tracking
+    if (win->m_isScrolling)
+    {
+        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);
+    }
+
+    return false;
+}

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


@@ -123,7 +120,11 @@ 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()
+{
+}
+
+wxScrollBar::~wxScrollBar()

 {
 }
 
 {
 }
 


@@ -131,179 +132,118 @@ 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_oldPos = 0.0;
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxScrollBar creation failed") );
+        return false;
+    }

 
 

-    if (style & wxSB_VERTICAL == wxSB_VERTICAL)
-        m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL );
-    else
+    const bool isVertical = (style & wxSB_VERTICAL) != 0;
+    if (isVertical)

         m_widget = gtk_vscrollbar_new( (GtkAdjustment *) 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 );
-  
-    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 );
+    else
+        m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL );
+
+    m_scrollBar[0] = (GtkRange*)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);
+
+    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 );
 
     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);
+    GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
+    return int(adj->value + 0.5);

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

-    return (int)(m_adjust->page_size+0.5);
+    GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
+    return int(adj->page_size);

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

-    return (int)(m_adjust->page_increment+0.5);
+    GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
+    return int(adj->page_increment);

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

-    return (int)(m_adjust->upper+0.5);
+    GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
+    return int(adj->upper);

 }
 
 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_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;
-    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 (GetThumbPosition() != viewStart)

     {
     {

-        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->page_increment = (float)(wxMax(fpage,0));
-    m_adjust->page_size = fthumb;
-
-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
-}
+        g_signal_handlers_block_by_func(m_widget,
+            (gpointer)gtk_value_changed, this);

 
 

-/* Backward compatibility */
-int wxScrollBar::GetValue(void) 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;
-}
+        gtk_range_set_value((GtkRange*)m_widget, viewStart);
+        m_scrollPos[0] = gtk_range_get_value((GtkRange*)m_widget);

 
 

-int wxScrollBar::GetViewLength() const
-{
-    return (int)(m_adjust->upper+0.5);
+        g_signal_handlers_unblock_by_func(m_widget,
+            (gpointer)gtk_value_changed, this);
+    }

 }
 
 }
 

-int wxScrollBar::GetObjectLength() const
+void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize, bool)

 {
 {

-    return (int)(m_adjust->page_size+0.5);
+    if (range == 0)
+    {
+        // GtkRange requires upper > lower
+        range =
+        thumbSize = 1;
+    }
+    GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
+    adj->step_increment = 1;
+    adj->page_increment = pageSize;
+    adj->page_size = thumbSize;
+    adj->value = position;
+    g_signal_handlers_block_by_func(m_widget, (void*)gtk_value_changed, this);
+    gtk_range_set_range((GtkRange*)m_widget, 0, range);
+    m_scrollPos[0] = adj->value;
+    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 );
+    SetScrollbar(GetThumbPosition(), GetThumbSize(), GetRange(), pageLength);

 }
 
 }
 

-void wxScrollBar::SetViewLength( int viewLength )
+void wxScrollBar::SetRange(int range)

 {
 {

-    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 );
+    SetScrollbar(GetThumbPosition(), GetThumbSize(), range, GetPageSize());

 }
 
 }
 

-bool wxScrollBar::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxScrollBar::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const

 {
 {

-    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 m_widget->window;

 }
 
 }
 

-void wxScrollBar::ApplyWidgetStyle()
+// static
+wxVisualAttributes
+wxScrollBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))

 {
 {

-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+    return GetDefaultAttributesFromGTKWidget(gtk_vscrollbar_new);

 }
 
 }
 

+#endif // wxUSE_SCROLLBAR