From 98f586ba618d050c84732e4fda5fb96cc6b252c4 Mon Sep 17 00:00:00 2001 From: Abou Al Montacir Date: Sun, 28 May 2023 11:10:24 +0200 Subject: [PATCH] GTK3: Migrate GtkSelectionMode to enumeration type. In Gtk3 WS code, integers were used instead of enumeration values. This leads to compilation error now that `GtkSelectionMode` is defined as an enumeration type. This commit fixes those errors. --- lcl/interfaces/gtk3/gtk3bindings/lazgtk3.pas | 17 ++++++++--------- lcl/interfaces/gtk3/gtk3wscomctrls.pp | 4 ++-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lcl/interfaces/gtk3/gtk3bindings/lazgtk3.pas b/lcl/interfaces/gtk3/gtk3bindings/lazgtk3.pas index 2b661c06f0..14d6a85576 100644 --- a/lcl/interfaces/gtk3/gtk3bindings/lazgtk3.pas +++ b/lcl/interfaces/gtk3/gtk3bindings/lazgtk3.pas @@ -264,6 +264,14 @@ type GTK_TEXT_DIR_LTR = 1, GTK_TEXT_DIR_RTL = 2 ); + TGtkSelectionMode = ( + TGtkSelectionModeMinValue = -$7FFFFFFF, + GTK_SELECTION_NONE = 0, + GTK_SELECTION_SINGLE = 1, + GTK_SELECTION_BROWSE = 2, + GTK_SELECTION_MULTIPLE = 3, + TGtkSelectionModeMaxValue = $7FFFFFFF + ); TGtkPolicyType = ( TGtkPolicyTypeMinValue = -$7FFFFFFF, GTK_POLICY_ALWAYS = 0, @@ -907,15 +915,6 @@ const GTK_ICON_VIEW_DROP_ABOVE: TGtkIconViewDropPosition = 4; GTK_ICON_VIEW_DROP_BELOW: TGtkIconViewDropPosition = 5; -type - TGtkSelectionMode = Integer; -const - { GtkSelectionMode } - GTK_SELECTION_NONE: TGtkSelectionMode = 0; - GTK_SELECTION_SINGLE: TGtkSelectionMode = 1; - GTK_SELECTION_BROWSE: TGtkSelectionMode = 2; - GTK_SELECTION_MULTIPLE: TGtkSelectionMode = 3; - type TGtkMessageType = Integer; const diff --git a/lcl/interfaces/gtk3/gtk3wscomctrls.pp b/lcl/interfaces/gtk3/gtk3wscomctrls.pp index 328190ea8f..2467aa479a 100644 --- a/lcl/interfaces/gtk3/gtk3wscomctrls.pp +++ b/lcl/interfaces/gtk3/gtk3wscomctrls.pp @@ -386,8 +386,8 @@ class procedure TGtk3WSCustomListView.SetPropertyInternal( const AIsSet: Boolean); const BoolToSelectionMode: array[Boolean] of TGtkSelectionMode = ( - 1 {GTK_SELECTION_SINGLE}, - 3 {GTK_SELECTION_MULTIPLE} + GTK_SELECTION_SINGLE {1} , + GTK_SELECTION_MULTIPLE {3} ); begin case AProp of