X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/463c4d7193481ac27626b282ccf0ac178f029abd..cc4d5638c66a409e421420ed7110917755a66788:/src/gtk1/scrolbar.cpp diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp index af054a217c..e7a38113ce 100644 --- a/src/gtk1/scrolbar.cpp +++ b/src/gtk1/scrolbar.cpp @@ -1,17 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/scrolbar.cpp +// Name: src/gtk1/scrolbar.cpp // Purpose: // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling // 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" @@ -19,9 +13,12 @@ #include "wx/scrolbar.h" -#include "wx/utils.h" -#include "wx/math.h" -#include "wx/gtk/private.h" +#ifndef WX_PRECOMP + #include "wx/utils.h" + #include "wx/math.h" +#endif + +#include "wx/gtk1/private.h" //----------------------------------------------------------------------------- // idle system @@ -35,7 +32,7 @@ extern bool g_isIdle; //----------------------------------------------------------------------------- extern bool g_blockEventsOnDrag; -extern bool g_blockEventsOnScroll; +static wxEventType g_currentUpDownEvent = wxEVT_NULL; static const float sensitivity = 0.02; @@ -45,6 +42,7 @@ 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 ) @@ -66,41 +64,74 @@ static void gtk_scrollbar_callback( GtkAdjustment *adjust, 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->HandleWindowEvent( event ); + } + + // throw other event (wxEVT_SCROLL_THUMBTRACK) wxScrollEvent event( command, win->GetId(), value, orient ); event.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( event ); + win->HandleWindowEvent( event ); /* - wxCommandEvent cevent( wxEVT_COMMAND_SCROLLBAR_UPDATED, win->GetId() ); + wxCommandEvent cevent( wxEVT_SCROLLBAR, win->GetId() ); cevent.SetEventObject( win ); 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__ + // 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; + } + + // There is no slider field any more win->m_isScrolling = (gdk_event->window == widget->slider); -#endif return FALSE; } +} //----------------------------------------------------------------------------- // "button_release_event" from slider //----------------------------------------------------------------------------- +extern "C" { static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget), GdkEventButton *WXUNUSED(gdk_event), @@ -109,8 +140,6 @@ gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget), if (g_isIdle) wxapp_install_idle_handler(); -// g_blockEventsOnScroll = FALSE; - if (win->m_isScrolling) { wxEventType command = wxEVT_SCROLL_THUMBRELEASE; @@ -119,20 +148,22 @@ gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget), wxScrollEvent event( command, win->GetId(), value, orient ); event.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( event ); + win->HandleWindowEvent( 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 //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl) - wxScrollBar::~wxScrollBar() { } @@ -141,22 +172,22 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, 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; if ((style & wxSB_VERTICAL) == wxSB_VERTICAL) - m_widget = gtk_vscrollbar_new( (GtkAdjustment *) NULL ); + m_widget = gtk_vscrollbar_new( NULL ); else - m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL ); + m_widget = gtk_hscrollbar_new( NULL ); m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) ); @@ -164,12 +195,10 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, "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, @@ -179,7 +208,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, PostCreation(size); - return TRUE; + return true; } int wxScrollBar::GetThumbPosition() const @@ -314,12 +343,10 @@ 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 ); } @@ -335,4 +362,4 @@ wxScrollBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) return GetDefaultAttributesFromGTKWidget(gtk_vscrollbar_new); } -#endif +#endif // wxUSE_SCROLLBAR