From e42a3c7df7847f4f9a47dcb08f54de9a20f886bb Mon Sep 17 00:00:00 2001 From: Abou Al Montacir Date: Thu, 1 Jun 2023 20:11:49 +0200 Subject: [PATCH] GTK3: Migrate TGtkSortType 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 `TGtkSortType` is defined as an enumeration type. This commit fixes those errors. --- lcl/interfaces/gtk3/gtk3bindings/lazgtk3.pas | 13 ++++++------- lcl/interfaces/gtk3/gtk3widgets.pas | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lcl/interfaces/gtk3/gtk3bindings/lazgtk3.pas b/lcl/interfaces/gtk3/gtk3bindings/lazgtk3.pas index 5a3a13a3f2..180a86c6a5 100644 --- a/lcl/interfaces/gtk3/gtk3bindings/lazgtk3.pas +++ b/lcl/interfaces/gtk3/gtk3bindings/lazgtk3.pas @@ -907,6 +907,12 @@ type GTK_LEVEL_BAR_MODE_DISCRETE = 1, TGtkLevelBarModeMaxValue = $7FFFFFFF ); + TGtkSortType = ( + TGtkSortTypeMinValue = -$7FFFFFFF, + GTK_SORT_ASCENDING = 0, + GTK_SORT_DESCENDING = 1, + TGtkSortTypeMaxValue = $7FFFFFFF + ); TGtkPackDirection = ( TGtkPackDirectionMinValue = -$7FFFFFFF, GTK_PACK_DIRECTION_LTR = 0, @@ -1305,13 +1311,6 @@ const GTK_ICON_LOOKUP_GENERIC_FALLBACK: TGtkIconLookupFlags = 8; GTK_ICON_LOOKUP_FORCE_SIZE: TGtkIconLookupFlags = 16; -type - TGtkSortType = Integer; -const - { GtkSortType } - GTK_SORT_ASCENDING: TGtkSortType = 0; - GTK_SORT_DESCENDING: TGtkSortType = 1; - type TGtkRcTokenType = Integer; const diff --git a/lcl/interfaces/gtk3/gtk3widgets.pas b/lcl/interfaces/gtk3/gtk3widgets.pas index 7f293ae54b..6446bea587 100644 --- a/lcl/interfaces/gtk3/gtk3widgets.pas +++ b/lcl/interfaces/gtk3/gtk3widgets.pas @@ -6332,7 +6332,7 @@ end; procedure TGtk3ListView.ColumnSetSortIndicator(const AIndex: Integer; const AColumn: TListColumn; const ASortIndicator: TSortIndicator); const - GtkOrder : array [ TSortIndicator] of TGtkSortType = (0, {GTK_SORT_ASCENDING}0, {GTK_SORT_DESCENDING}1); + GtkOrder : array [ TSortIndicator] of TGtkSortType = (GTK_SORT_ASCENDING {0}, GTK_SORT_ASCENDING {0}, GTK_SORT_DESCENDING {1}); var AGtkColumn: PGtkTreeViewColumn; begin