/////////////////////////////////////////////////////////////////////////////
-// Name: scrolbar.cpp
+// Name: src/gtk/scrolbar.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#pragma implementation "scrolbar.h"
#endif
-#include "wx/scrolbar.h"
+#include "wx/defs.h"
#if wxUSE_SCROLLBAR
+#include "wx/scrolbar.h"
+
#include "wx/utils.h"
+
#include <math.h>
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/gtk/private.h"
//-----------------------------------------------------------------------------
// idle system
extern bool g_blockEventsOnDrag;
extern bool g_blockEventsOnScroll;
+static const float sensitivity = 0.02;
+
//-----------------------------------------------------------------------------
// "value_changed"
//-----------------------------------------------------------------------------
-static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *win )
+// FIXME: is GtkScrollType really passed to us as 2nd argument?
+
+static void gtk_scrollbar_callback( GtkAdjustment *adjust,
+ SCROLLBAR_CBACK_ARG
+ wxScrollBar *win )
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->m_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;
- }
+ 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));
- int value = (int)(win->m_adjust->value+0.5);
+ double dvalue = adjust->value;
+ int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);
int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
// "button_press_event" from slider
//-----------------------------------------------------------------------------
-static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget),
- GdkEventButton *WXUNUSED(gdk_event),
+static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
+ GdkEventButton *gdk_event,
wxScrollBar *win )
{
if (g_isIdle) wxapp_install_idle_handler();
- win->SetScrolling(TRUE);
// g_blockEventsOnScroll = TRUE; doesn't work in DialogEd
+
+ // FIXME: there is no slider field any more, what was meant here?
+#ifndef __WXGTK20__
+ win->m_isScrolling = (gdk_event->window == widget->slider);
+#endif
return FALSE;
}
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" );
+ if (win->m_isScrolling)
+ {
+ wxEventType command = wxEVT_SCROLL_THUMBRELEASE;
+ int value = (int)ceil(win->m_adjust->value);
+ int dir = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
+
+ wxScrollEvent event( command, value, dir );
+ event.SetEventObject( win );
+ win->GetEventHandler()->ProcessEvent( event );
+ }
+ win->m_isScrolling = FALSE;
+
return FALSE;
}
IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
-wxScrollBar::~wxScrollBar(void)
+wxScrollBar::~wxScrollBar()
{
}
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
- wxFAIL_MSG( _T("wxScrollBar creation failed") );
- return FALSE;
+ wxFAIL_MSG( wxT("wxScrollBar creation failed") );
+ return FALSE;
}
m_oldPos = 0.0;
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
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 );
+
gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+
+ gtk_signal_connect( GTK_OBJECT(m_adjust),
+ "value_changed",
+ (GtkSignalFunc) gtk_scrollbar_callback,
+ (gpointer) this );
}
void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize,
}
/* Backward compatibility */
-int wxScrollBar::GetValue(void) const
+int wxScrollBar::GetValue() const
{
return GetThumbPosition();
}
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)
+#ifndef __WXGTK20__
+ || (window == range->trough)
+ || (window == range->slider)
+ || (window == range->step_forw)
+ || (window == range->step_back)
+#endif // GTK+ 1.x
+ );
}
void wxScrollBar::ApplyWidgetStyle()
projects / wxWidgets.git / blobdiff