From 97c59105fe509e472dcd24c6a232bd100f87917b Mon Sep 17 00:00:00 2001 From: zeljko Date: Mon, 24 Mar 2014 11:14:49 +0000 Subject: [PATCH] Gtk2: fixed TScrollingWinControl positions update.issue #25909 git-svn-id: trunk@44504 - --- lcl/interfaces/gtk2/gtk2callback.inc | 6 +++--- lcl/interfaces/gtk2/gtk2wsforms.pp | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lcl/interfaces/gtk2/gtk2callback.inc b/lcl/interfaces/gtk2/gtk2callback.inc index 91c6b0bb57..9478367988 100644 --- a/lcl/interfaces/gtk2/gtk2callback.inc +++ b/lcl/interfaces/gtk2/gtk2callback.inc @@ -3153,7 +3153,7 @@ var Widget: PGTKWidget; AValue: gDouble; begin - // used only by TCustomForm ! #issue #25479 + // used only by TScrollingWinControl ! #issue #25479 Widget := PGTKWidget(ARange); if G_OBJECT_TYPE(ARange) = gtk_hscrollbar_get_type then Msg.Msg := LM_HSCROLL @@ -3186,11 +3186,11 @@ begin // do not send messages to LCL if we are already synced. if (Msg.Msg = LM_VSCROLL) and - (TCustomForm(PWidgetInfo(Data)^.LCLObject).VertScrollBar.Position = Msg.Pos) then + (TScrollingWinControl(PWidgetInfo(Data)^.LCLObject).VertScrollBar.Position = Msg.Pos) then exit else if (Msg.Msg = LM_HSCROLL) and - (TCustomForm(PWidgetInfo(Data)^.LCLObject).HorzScrollBar.Position = Msg.Pos) then + (TScrollingWinControl(PWidgetInfo(Data)^.LCLObject).HorzScrollBar.Position = Msg.Pos) then exit; DeliverMessage(PWidgetInfo(Data)^.LCLObject, Msg); diff --git a/lcl/interfaces/gtk2/gtk2wsforms.pp b/lcl/interfaces/gtk2/gtk2wsforms.pp index 53367a63be..24bb104778 100644 --- a/lcl/interfaces/gtk2/gtk2wsforms.pp +++ b/lcl/interfaces/gtk2/gtk2wsforms.pp @@ -871,6 +871,12 @@ begin TGCallback(@Gtk2RangeScrollCB), WidgetInfo); g_signal_connect(Scrolled^.vscrollbar, 'change-value', TGCallback(@Gtk2RangeScrollCB), WidgetInfo); + + g_signal_connect(Scrolled^.hscrollbar, 'value-changed', + TGCallback(@Gtk2RangeValueChanged), WidgetInfo); + g_signal_connect(Scrolled^.vscrollbar, 'value-changed', + TGCallback(@Gtk2RangeValueChanged), WidgetInfo); + g_signal_connect(Scrolled^.hscrollbar, 'button-press-event', TGCallback(@Gtk2RangeScrollPressCB), WidgetInfo); g_signal_connect(Scrolled^.hscrollbar, 'button-release-event',