Commit pickers-fixes.patch added to 1472329 (Francesco Montorsi)

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

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index 312985e972cdc0cece952e6a6743e6bf90bd28fa..13983bb7718c4ff6476b691a0a99978f8273858c 100644 (file)
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -1,94 +1,96 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 
 

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

 
 

-extern bool   g_blockEventsOnDrag;
+#include "wx/gtk/private.h"

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

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

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

-static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *win )
-{ 
-  if (!win->HasVMT()) return;
-  if (g_blockEventsOnDrag) return;
-    
-  float diff = win->m_adjust->value - win->m_oldPos;
-  if (fabs(diff) < 0.2) return;
-  
-  wxEventType command = wxEVT_NULL;
-  
-  float line_step = win->m_adjust->step_increment;
-  float page_step = win->m_adjust->page_increment;
-  
-  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;
-  if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;
-  
-  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 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();
+        wxScrollEvent event(eventType, win->GetId(), value, orient);
+        event.SetEventObject(win);
+        win->GetEventHandler()->ProcessEvent(event);
+        if (!win->m_isScrolling)
+        {
+            wxScrollEvent event(wxEVT_SCROLL_CHANGED, win->GetId(), value, orient);
+            event.SetEventObject(win);
+            win->GetEventHandler()->ProcessEvent(event);
+        }
+    }
+}

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

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

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

-static gint gtk_scrollbar_button_press_callback( GtkRange *widget, GdkEventButton *gdk_event, wxScrollBar *win )
+extern "C" {
+static gboolean
+gtk_button_press_event(GtkRange*, GdkEventButton*, wxScrollBar* win)

 {
 {

-  if (gdk_event->window != widget->slider) return FALSE;
-    
-  win->m_isScrolling = TRUE;
-  
-  return FALSE;
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    win->m_mouseButtonDown = true;
+    return false;
+}

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

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

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

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

 {
 {

-  if (gdk_event->window != widget->slider) return FALSE;
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    win->m_mouseButtonDown = false;
+    // If thumb tracking
+    if (win->m_isScrolling)
+    {
+        win->m_isScrolling = false;
+        const int value = win->GetThumbPosition();
+        const int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;

 
 

-  gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
-      
-  win->m_isScrolling = FALSE;
-  
-  return FALSE;
+        wxScrollEvent event(wxEVT_SCROLL_THUMBRELEASE, win->GetId(), value, orient);
+        event.SetEventObject(win);
+        win->GetEventHandler()->ProcessEvent(event);
+
+        wxScrollEvent event2(wxEVT_SCROLL_CHANGED, win->GetId(), value, orient);
+        event2.SetEventObject(win);
+        win->GetEventHandler()->ProcessEvent(event2);
+    }
+
+    return false;
+}

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


@@ -97,7 +99,11 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *widget, GdkEventBut
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
 

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

 {
 }
 
 {
 }
 


@@ -105,173 +111,116 @@ 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;
-  
-  PreCreation( parent, id, pos, size, style, name );
-  
-  SetValidator( validator );
-
-  m_oldPos = 0.0;
-
-  if (style & wxSB_VERTICAL == wxSB_VERTICAL)
-    m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL );
-  else
-    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 );
-
-  m_parent->AddChild( this );
-
-  (m_parent->m_insertCallback)( m_parent, this );
-  
-  PostCreation();
-  
-  SetBackgroundColour( parent->GetBackgroundColour() );
-
-  Show( TRUE );
-    
-  return TRUE;
-}
+    m_needParent = true;
+    m_acceptsFocus = true;

 
 

-int wxScrollBar::GetPosition(void) const
-{
-  return (int)(m_adjust->value+0.5);
-}
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxScrollBar creation failed") );
+        return false;
+    }

 
 

-int wxScrollBar::GetThumbSize() const
-{
-  return (int)(m_adjust->page_size+0.5);
-}
+    const bool isVertical = (style & wxSB_VERTICAL) != 0;
+    if (isVertical)
+        m_widget = gtk_vscrollbar_new( (GtkAdjustment *) NULL );
+    else
+        m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL );

 
 

-int wxScrollBar::GetPageSize() const
-{
-  return (int)(m_adjust->page_increment+0.5);
-}
+    m_scrollBar[int(isVertical)] = (GtkRange*)m_widget;

 
 

-int wxScrollBar::GetRange() const
-{
-  return (int)(m_adjust->upper+0.5);
-}
+    g_signal_connect(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);

 
 

-void wxScrollBar::SetPosition( int viewStart )
-{
-  float fpos = (float)viewStart;
-  m_oldPos = fpos;
-  if (fabs(fpos-m_adjust->value) < 0.2) return;
-  m_adjust->value = fpos;
+    m_parent->DoAddChild( this );

 
 

-  if (!m_isScrolling)
-    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
-}
+    PostCreation(size);

 
 

-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))
-  {
-    SetPosition( 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" );
+    return true;

 }
 
 }
 

-// Backward compatibility
-int wxScrollBar::GetValue(void) const
+int wxScrollBar::GetThumbPosition() const

 {
 {

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

 }
 
 }
 

-void wxScrollBar::SetValue( int viewStart )
+int wxScrollBar::GetThumbSize() const

 {
 {

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

 }
 
 }
 

-void wxScrollBar::GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength ) const
+int wxScrollBar::GetPageSize() 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;
+    GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
+    return int(adj->page_increment);

 }
 
 }
 

-int wxScrollBar::GetViewLength() const
+int wxScrollBar::GetRange() const

 {
 {

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

 }
 
 }
 

-int wxScrollBar::GetObjectLength() const
+void wxScrollBar::SetThumbPosition( int viewStart )

 {
 {

-  return (int)(m_adjust->page_size+0.5);
+    if (GetThumbPosition() != viewStart)
+    {
+        BlockScrollEvent();
+        gtk_range_set_value((GtkRange*)m_widget, viewStart);
+        UnblockScrollEvent();
+        GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
+        const int i = HasFlag(wxSB_VERTICAL);
+        m_scrollPos[i] = adj->value;
+    }

 }
 
 }
 

-void wxScrollBar::SetPageSize( int pageLength )
+void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize, bool)

 {
 {

-  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 );
+    if (range == 0)
+    {
+        // GtkRange requires upper > lower
+        range =
+        thumbSize = 1;
+    }
+    GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
+    adj->value = position;
+    adj->step_increment = 1;
+    adj->page_increment = pageSize;
+    adj->page_size = thumbSize;
+    BlockScrollEvent();
+    gtk_range_set_range((GtkRange*)m_widget, 0, range);
+    UnblockScrollEvent();
+    const int i = HasFlag(wxSB_VERTICAL);
+    m_scrollPos[i] = adj->value;

 }
 
 }
 

-void wxScrollBar::SetObjectLength( int objectLength )
+void wxScrollBar::SetPageSize( int pageLength )

 {
 {

-  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 )
 {
 }
 
 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) );
+    GtkRange *range = GTK_RANGE(m_widget);
+    return ( (window == GTK_WIDGET(range)->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