From 22c6d6658f794b1ff11945e5938bcc5defb17df0 Mon Sep 17 00:00:00 2001 From: Abou Al Montacir Date: Thu, 1 Jun 2023 20:09:29 +0200 Subject: [PATCH] GTK3: Migrate TGtkTreeViewColumnSizing 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 `TGtkTreeViewColumnSizing` is defined as an enumeration type. This commit fixes those errors. --- lcl/interfaces/gtk3/gtk3bindings/lazgtk3.pas | 15 +++++++-------- lcl/interfaces/gtk3/gtk3widgets.pas | 4 ++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lcl/interfaces/gtk3/gtk3bindings/lazgtk3.pas b/lcl/interfaces/gtk3/gtk3bindings/lazgtk3.pas index 5a2cbcd8ea..5a3a13a3f2 100644 --- a/lcl/interfaces/gtk3/gtk3bindings/lazgtk3.pas +++ b/lcl/interfaces/gtk3/gtk3bindings/lazgtk3.pas @@ -1220,6 +1220,13 @@ type GTK_TOOL_PALETTE_DRAG_GROUPS = 2, TGtkToolPaletteDragTargetsMaxValue = $7FFFFFFF ); + TGtkTreeViewColumnSizing = ( + TGtkTreeViewColumnSizingMinValue = -$7FFFFFFF, + GTK_TREE_VIEW_COLUMN_GROW_ONLY = 0, + GTK_TREE_VIEW_COLUMN_AUTOSIZE = 1, + GTK_TREE_VIEW_COLUMN_FIXED = 2, + TGtkTreeViewColumnSizingMaxValue = $7FFFFFFF + ); TGtkTreeViewDropPosition = ( TGtkTreeViewDropPositionMinValue = -$7FFFFFFF, GTK_TREE_VIEW_DROP_BEFORE = 0, @@ -1385,14 +1392,6 @@ const GTK_TOOLBAR_SPACE_EMPTY: TGtkToolbarSpaceStyle = 0; GTK_TOOLBAR_SPACE_LINE: TGtkToolbarSpaceStyle = 1; -type - TGtkTreeViewColumnSizing = Integer; -const - { GtkTreeViewColumnSizing } - GTK_TREE_VIEW_COLUMN_GROW_ONLY: TGtkTreeViewColumnSizing = 0; - GTK_TREE_VIEW_COLUMN_AUTOSIZE: TGtkTreeViewColumnSizing = 1; - GTK_TREE_VIEW_COLUMN_FIXED: TGtkTreeViewColumnSizing = 2; - type TGtkUIManagerItemType = Integer; const diff --git a/lcl/interfaces/gtk3/gtk3widgets.pas b/lcl/interfaces/gtk3/gtk3widgets.pas index cd0fd68ae4..7f293ae54b 100644 --- a/lcl/interfaces/gtk3/gtk3widgets.pas +++ b/lcl/interfaces/gtk3/gtk3widgets.pas @@ -6241,8 +6241,8 @@ procedure TGtk3ListView.SetColumnAutoSize(AIndex: Integer; AColumn: TListColumn; AAutoSize: Boolean); const SizingMap: array[Boolean] of TGtkTreeViewColumnSizing = ( - 2 {GTK_TREE_VIEW_COLUMN_FIXED}, - 1 {GTK_TREE_VIEW_COLUMN_AUTOSIZE} + GTK_TREE_VIEW_COLUMN_FIXED {2}, + GTK_TREE_VIEW_COLUMN_AUTOSIZE {1} ); var AGtkColumn: PGtkTreeViewColumn;