// 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"
#include "wx/scrolbar.h"
#include "wx/utils.h"
-
-#include <math.h>
-
+#include "wx/math.h"
#include "wx/gtk/private.h"
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
extern bool g_blockEventsOnDrag;
-extern bool g_blockEventsOnScroll;
+static wxEventType g_currentUpDownEvent = wxEVT_NULL;
static const float sensitivity = 0.02;
// FIXME: is GtkScrollType really passed to us as 2nd argument?
+extern "C" {
static void gtk_scrollbar_callback( GtkAdjustment *adjust,
- SCROLLBAR_CBACK_ARG
wxScrollBar *win )
{
if (g_isIdle) wxapp_install_idle_handler();
win->m_oldPos = adjust->value;
- wxEventType command = GtkScrollTypeToWx(GET_SCROLL_TYPE(win->m_widget));
+ 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)
+ {
+ wxScrollEvent event( g_currentUpDownEvent, win->GetId(), value, orient );
+ event.SetEventObject( win );
+ win->GetEventHandler()->ProcessEvent( event );
+ }
+
+ // throw other event (wxEVT_SCROLL_THUMBTRACK)
wxScrollEvent event( command, win->GetId(), value, orient );
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event );
win->ProcessEvent( cevent );
*/
}
+}
//-----------------------------------------------------------------------------
// "button_press_event" from slider
//-----------------------------------------------------------------------------
-
+extern "C" {
static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
GdkEventButton *gdk_event,
wxScrollBar *win )
{
if (g_isIdle) wxapp_install_idle_handler();
-// 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
+ // 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;
}
+}
//-----------------------------------------------------------------------------
// "button_release_event" from slider
//-----------------------------------------------------------------------------
+extern "C" {
static gint
gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
GdkEventButton *WXUNUSED(gdk_event),
if (g_isIdle)
wxapp_install_idle_handler();
-// g_blockEventsOnScroll = FALSE;
-
if (win->m_isScrolling)
{
wxEventType command = wxEVT_SCROLL_THUMBRELEASE;
win->GetEventHandler()->ProcessEvent( event );
}
- win->m_isScrolling = FALSE;
+ win->m_isScrolling = false;
+
+ // reset the LINEUP/LINEDOWN flag when the mouse button is released
+ g_currentUpDownEvent = wxEVT_NULL;
return FALSE;
}
+}
//-----------------------------------------------------------------------------
// wxScrollBar
const wxPoint& pos, const wxSize& size,
long style, const wxValidator& validator, const wxString& name )
{
- m_needParent = TRUE;
- m_acceptsFocus = TRUE;
+ 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;
+ return false;
}
m_oldPos = 0.0;
m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL );
m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
+ if ( style & wxSB_VERTICAL )
+ {
+ SetVScrollAdjustment(m_adjust);
+ }
- 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 );
+ 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 );
PostCreation(size);
- return TRUE;
+ return true;
}
int wxScrollBar::GetThumbPosition() 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 );
+ g_signal_handlers_disconnect_by_func (m_adjust,
+ (gpointer) gtk_scrollbar_callback,
+ this);
- gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+ g_signal_emit_by_name (m_adjust, "value_changed");
- gtk_signal_connect( GTK_OBJECT(m_adjust),
- "value_changed",
- (GtkSignalFunc) gtk_scrollbar_callback,
- (gpointer) this );
+ g_signal_connect (m_adjust, "value_changed",
+ G_CALLBACK (gtk_scrollbar_callback), this);
}
void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize,
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 */
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
- );
+ 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();
}
-wxSize wxScrollBar::DoGetBestSize() const
+// static
+wxVisualAttributes
+wxScrollBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
{
- return wxControl::DoGetBestSize();
+ return GetDefaultAttributesFromGTKWidget(gtk_vscrollbar_new);
}
#endif
projects / wxWidgets.git / blobdiff