From cbe336218b1ffa07f55e3c6ac0abf7d0b8c8b4e2 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Fri, 4 Mar 2005 12:28:11 +0000
Subject: [PATCH] fixed gtk2 intf scrollbar handling  from Danny Milosavljevic

git-svn-id: trunk@6887 -
---
 lcl/interfaces/gtk/gtkcallback.inc | 12 ++++++++----
 lcl/interfaces/gtk/gtkobject.inc   |  7 +++++--
 lcl/interfaces/gtk/gtkproc.pp      |  4 ++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/lcl/interfaces/gtk/gtkcallback.inc b/lcl/interfaces/gtk/gtkcallback.inc
index e5c0fe490a..f7088269e8 100644
--- a/lcl/interfaces/gtk/gtkcallback.inc
+++ b/lcl/interfaces/gtk/gtkcallback.inc
@@ -2516,7 +2516,8 @@ begin
   end;
 end;
 
-function GTK26HScrollCB(Range:PGTKRAnge; Scroll: PGtkScrollType; Value: gdouble;
+function GTK26HScrollCB(Range:PGTKRAnge; Scroll: TGtkScrollType; 
+Value: gdouble;
   data: gpointer): gboolean; cdecl;
 var
   Msg: TLMHScroll;
@@ -2526,13 +2527,13 @@ begin
   with Msg do begin
     pos := Round(Range^.Adjustment^.Value);
     ScrollBar := HWND(Range);
-    ScrollCode := ScrollTypeToSbCode(False, Scroll^,
+    ScrollCode := ScrollTypeToSbCode(False, Scroll,
       gtk_range_get_update_policy(Range));
   end;
   DeliverMessage(Data, Msg);
 end;
 
-function GTK26VScrollCB(Range:PGTKRAnge; Scroll: PGtkScrollType; Value: gdouble;
+function GTK26VScrollCB(Range:PGTKRAnge; Scroll: TGtkScrollType; Value: gdouble;
   data: gpointer): gboolean; cdecl;
 var
   Msg: TLMVScroll;
@@ -2542,7 +2543,7 @@ begin
   with Msg do begin
     pos := Round(Range^.Adjustment^.Value);
     ScrollBar := HWND(Range);
-    ScrollCode := ScrollTypeToSbCode(True, Scroll^,
+    ScrollCode := ScrollTypeToSbCode(True, Scroll,
       gtk_range_get_update_policy(Range));
   end;
   DeliverMessage(Data, Msg);
@@ -2975,6 +2976,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.273  2005/03/04 12:28:11  mattias
+  fixed gtk2 intf scrollbar handling  from Danny Milosavljevic
+
   Revision 1.272  2005/03/04 12:21:55  mattias
   fixed TShape FPCanvas issue
 
diff --git a/lcl/interfaces/gtk/gtkobject.inc b/lcl/interfaces/gtk/gtkobject.inc
index 1d10df0525..2dcb532887 100644
--- a/lcl/interfaces/gtk/gtkobject.inc
+++ b/lcl/interfaces/gtk/gtkobject.inc
@@ -3483,7 +3483,7 @@ begin
             gObject := gtk_object_get_data(gObject, odnScrollArea);
           Scroll := PgtkObject(PGtkScrolledWindow(gObject)^.HScrollBar);
         end;
-        ConnectSenderSignal(Scroll,'changed-value', @GTK26HScrollCB);
+        ConnectSenderSignal(Scroll,'change-value', @GTK26HScrollCB);
       end else begin
         if ALCLObject is TScrollBar then
           Adjustment := PgtkObject(PgtkhScrollBar(gObject)^.Scrollbar.Range.Adjustment)
@@ -3509,7 +3509,7 @@ begin
             gObject := gtk_object_get_data(gObject, odnScrollArea);
           Scroll := PGtkObject(PGtkScrolledWindow(gObject)^.VScrollBar);
         end;
-        connectSenderSignal(Scroll,'changed-value', @GTK26VScrollCB);
+        connectSenderSignal(Scroll,'change-value', @GTK26VScrollCB);
       end else begin
         if ALCLObject is TScrollBar then
           Adjustment := PGtkObject(PgtkhScrollBar(gObject)^.Scrollbar.Range.Adjustment)
@@ -6998,6 +6998,9 @@ end;
  { =============================================================================
 
   $Log$
+  Revision 1.636  2005/03/04 12:28:11  mattias
+  fixed gtk2 intf scrollbar handling  from Danny Milosavljevic
+
   Revision 1.635  2005/03/04 12:21:55  mattias
   fixed TShape FPCanvas issue
 
diff --git a/lcl/interfaces/gtk/gtkproc.pp b/lcl/interfaces/gtk/gtkproc.pp
index 37bb2ebb7f..fc503b289f 100644
--- a/lcl/interfaces/gtk/gtkproc.pp
+++ b/lcl/interfaces/gtk/gtkproc.pp
@@ -208,9 +208,9 @@ function gtkFocusInNotifyCB (widget: PGtkWidget; event: PGdkEvent;
   data: gpointer): GBoolean; cdecl;
 function gtkFocusOutNotifyCB (widget: PGtkWidget; event: PGdkEvent;
   data: gpointer): GBoolean; cdecl;
-function GTK26HScrollCB(Range: PGTKRange; Scroll: PGtkScrollType; Value: gdouble;
+function GTK26HScrollCB(Range: PGTKRange; Scroll: TGtkScrollType; Value: gdouble;
   data: gpointer): gboolean; cdecl;
-function GTK26VScrollCB(Range: PGTKRange; Scroll: PGtkScrollType; Value: gdouble;
+function GTK26VScrollCB(Range: PGTKRange; Scroll: TGtkScrollType; Value: gdouble;
   data: gpointer): gboolean; cdecl;
 function GTKHScrollCB(Adjustment: PGTKAdjustment; data: GPointer): GBoolean; cdecl;
 function GTKVScrollCB(Adjustment: PGTKAdjustment;