From 7eedf76e73cc22e9b9f5eb3373c7082e25bbf4b0 Mon Sep 17 00:00:00 2001 From: Abou Al Montacir Date: Thu, 1 Jun 2023 20:01:25 +0200 Subject: [PATCH] GTK3: Migrate TGdkScrollDirection to enumeration type. In Gtk3 WS code, variables of type Integer were used instead of ones of relevant enumeration type. This leads to compilation error now that `TGdkScrollDirection` is defined as an enumeration type. This commit fixes those errors. --- lcl/interfaces/gtk3/gtk3bindings/lazgdk3.pas | 19 +++++++++---------- lcl/interfaces/gtk3/gtk3widgets.pas | 12 ++++++------ 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/lcl/interfaces/gtk3/gtk3bindings/lazgdk3.pas b/lcl/interfaces/gtk3/gtk3bindings/lazgdk3.pas index 45d561627b..36b30f1a41 100644 --- a/lcl/interfaces/gtk3/gtk3bindings/lazgdk3.pas +++ b/lcl/interfaces/gtk3/gtk3bindings/lazgdk3.pas @@ -2689,6 +2689,15 @@ type GDK_TOUCH_CANCEL = 40, GDK_EVENT_LAST = 41 ); + TGdkScrollDirection = ( + TGdkScrollDirectionMinValue = -$7FFFFFFF, + GDK_SCROLL_UP = 0, + GDK_SCROLL_DOWN = 1, + GDK_SCROLL_LEFT = 2, + GDK_SCROLL_RIGHT = 3, + GDK_SCROLL_SMOOTH = 4, + TGdkScrollDirectionMaxValue = $7FFFFFFF + ); TGdkVisualType = ( TGdkVisualTypeMinValue = -$7FFFFFFF, GDK_VISUAL_STATIC_GRAY = 0, @@ -2708,16 +2717,6 @@ const GDK_VISIBILITY_PARTIAL: TGdkVisibilityState = 1; GDK_VISIBILITY_FULLY_OBSCURED: TGdkVisibilityState = 2; -type - TGdkScrollDirection = Integer; -const - { GdkScrollDirection } - GDK_SCROLL_UP: TGdkScrollDirection = 0; - GDK_SCROLL_DOWN: TGdkScrollDirection = 1; - GDK_SCROLL_LEFT: TGdkScrollDirection = 2; - GDK_SCROLL_RIGHT: TGdkScrollDirection = 3; - GDK_SCROLL_SMOOTH: TGdkScrollDirection = 4; - type TGdkNotifyType = Integer; const diff --git a/lcl/interfaces/gtk3/gtk3widgets.pas b/lcl/interfaces/gtk3/gtk3widgets.pas index d3e54b970d..cd0fd68ae4 100644 --- a/lcl/interfaces/gtk3/gtk3widgets.pas +++ b/lcl/interfaces/gtk3/gtk3widgets.pas @@ -1616,10 +1616,10 @@ begin {$ENDIF} Result := False; case AEvent^.scroll.direction of - 0, 1{GDK_SCROLL_UP, - GDK_SCROLL_DOWN}: Msg.Msg := LM_VSCROLL; - 2, 3{GDK_SCROLL_LEFT, - GDK_SCROLL_RIGHT}: Msg.Msg := LM_HSCROLL; + GDK_SCROLL_UP, {0} + GDK_SCROLL_DOWN {1}: Msg.Msg := LM_VSCROLL; + GDK_SCROLL_LEFT, {2} + GDK_SCROLL_RIGHT {3}: Msg.Msg := LM_HSCROLL; else begin if AEvent^.scroll.direction = GDK_SCROLL_SMOOTH then @@ -1697,8 +1697,8 @@ begin FillChar(MessE{%H-},SizeOf(MessE),0); MessE.Msg := LM_MOUSEWHEEL; case AEvent^.scroll.direction of - 0 {GDK_SCROLL_UP}: MessE.WheelDelta := 120; - 1 {GDK_SCROLL_DOWN}: MessE.WheelDelta := -120; + GDK_SCROLL_UP {0}: MessE.WheelDelta := 120; + GDK_SCROLL_DOWN {1}: MessE.WheelDelta := -120; else exit; end;