X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c2f14eeb84c08651a96050ff1f05d195fe3db7f..4eccd3a10f820927f6e75092b1ecb266da48f5f4:/src/gtk/scrolbar.cpp?ds=sidebyside diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp index a2bb3082e8..3a44d755f0 100644 --- a/src/gtk/scrolbar.cpp +++ b/src/gtk/scrolbar.cpp @@ -7,11 +7,6 @@ // 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" @@ -35,7 +30,6 @@ extern bool g_isIdle; //----------------------------------------------------------------------------- extern bool g_blockEventsOnDrag; -extern bool g_blockEventsOnScroll; static wxEventType g_currentUpDownEvent = wxEVT_NULL; static const float sensitivity = 0.02; @@ -46,8 +40,8 @@ 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(); @@ -60,24 +54,25 @@ static void gtk_scrollbar_callback( GtkAdjustment *adjust, 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; - wxScrollEvent event( command, win->GetId(), value, orient ); - event.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( event ); - // throw a LINEUP / LINEDOWN event if necessary if (g_currentUpDownEvent != wxEVT_NULL) { - wxScrollEvent event( g_currentUpDownEvent, win->GetId(), value, orient ); + 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 ); /* wxCommandEvent cevent( wxEVT_COMMAND_SCROLLBAR_UPDATED, win->GetId() ); @@ -85,10 +80,12 @@ static void gtk_scrollbar_callback( GtkAdjustment *adjust, win->ProcessEvent( cevent ); */ } +} //----------------------------------------------------------------------------- // "button_press_event" from slider //----------------------------------------------------------------------------- +extern "C" { static gint gtk_scrollbar_button_press_callback( GtkRange *widget, GdkEventButton *gdk_event, wxScrollBar *win ) @@ -101,9 +98,9 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *widget, { int scroll_height, mouse_pos; - // get the mouse position when the click is done - if (widget->orientation == GTK_ORIENTATION_VERTICAL) - { + // 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; } @@ -112,7 +109,7 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *widget, 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; @@ -120,18 +117,15 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *widget, g_currentUpDownEvent = wxEVT_SCROLL_LINEUP; } -#ifndef __WXGTK20__ - // 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), @@ -151,13 +145,14 @@ gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget), 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 @@ -173,14 +168,14 @@ 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; @@ -191,25 +186,25 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, 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 @@ -242,16 +237,14 @@ void wxScrollBar::SetThumbPosition( int viewStart ) 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, @@ -279,7 +272,7 @@ void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int page 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 */ @@ -343,14 +336,7 @@ void wxScrollBar::SetViewLength( int viewLength ) 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) ); } wxSize wxScrollBar::DoGetBestSize() const