mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-09-13 12:39:15 +02:00
parent
ff7e434cf4
commit
6a71c231ad
@ -357,7 +357,6 @@ var
|
|||||||
Str: String;
|
Str: String;
|
||||||
ListColumn: TListColumn;
|
ListColumn: TListColumn;
|
||||||
ListItem: TListItem;
|
ListItem: TListItem;
|
||||||
Value: TGValue;
|
|
||||||
begin
|
begin
|
||||||
if G_IS_OBJECT(cell) = false then
|
if G_IS_OBJECT(cell) = false then
|
||||||
exit;
|
exit;
|
||||||
|
@ -247,7 +247,7 @@ type
|
|||||||
|
|
||||||
implementation
|
implementation
|
||||||
|
|
||||||
uses Gtk2CellRenderer;
|
uses Gtk2CellRenderer, GtkExtra;
|
||||||
|
|
||||||
// Will be used commonly for ListViews and TreeViews
|
// Will be used commonly for ListViews and TreeViews
|
||||||
procedure GetCommonTreeViewWidgets(ATreeViewHandle: PGtkWidget;
|
procedure GetCommonTreeViewWidgets(ATreeViewHandle: PGtkWidget;
|
||||||
|
@ -27,12 +27,10 @@ type
|
|||||||
|
|
||||||
procedure Gtk2_ItemCheckedChanged(renderer: PGtkCellRendererToggle; PathStr: Pgchar; WidgetInfo: PWidgetInfo);cdecl;
|
procedure Gtk2_ItemCheckedChanged(renderer: PGtkCellRendererToggle; PathStr: Pgchar; WidgetInfo: PWidgetInfo);cdecl;
|
||||||
var
|
var
|
||||||
Widgets: PTVWidgets;
|
|
||||||
LV: TLVHack;
|
LV: TLVHack;
|
||||||
Index: Integer;
|
Index: Integer;
|
||||||
LI: TLVItemHack;
|
LI: TLVItemHack;
|
||||||
begin
|
begin
|
||||||
Widgets := PTVWidgets(WidgetInfo^.UserData);
|
|
||||||
LV := TLVHack(WidgetInfo^.LCLObject);
|
LV := TLVHack(WidgetInfo^.LCLObject);
|
||||||
Index := StrToInt(PathStr);
|
Index := StrToInt(PathStr);
|
||||||
LI := TLVItemHack(LV.Items.Item[Index]);
|
LI := TLVItemHack(LV.Items.Item[Index]);
|
||||||
@ -266,8 +264,6 @@ end;
|
|||||||
procedure Gtk2WSLV_ListViewGetPixbufDataFunc(tree_column: PGtkTreeViewColumn;
|
procedure Gtk2WSLV_ListViewGetPixbufDataFunc(tree_column: PGtkTreeViewColumn;
|
||||||
cell: PGtkCellRenderer; tree_model: PGtkTreeModel; iter: PGtkTreeIter; WidgetInfo: PWidgetInfo); cdecl;
|
cell: PGtkCellRenderer; tree_model: PGtkTreeModel; iter: PGtkTreeIter; WidgetInfo: PWidgetInfo); cdecl;
|
||||||
var
|
var
|
||||||
ItemIndex: Integer;
|
|
||||||
TreePath: PGtkTreePath;
|
|
||||||
ListItem: TListItem;
|
ListItem: TListItem;
|
||||||
Images: TList;
|
Images: TList;
|
||||||
Widgets: PTVWidgets;
|
Widgets: PTVWidgets;
|
||||||
@ -549,7 +545,6 @@ var
|
|||||||
column: PGtkTreeViewColumn;
|
column: PGtkTreeViewColumn;
|
||||||
pixrenderer,
|
pixrenderer,
|
||||||
textrenderer: PGtkCellRenderer;
|
textrenderer: PGtkCellRenderer;
|
||||||
RealIndex: Integer;
|
|
||||||
WidgetInfo: PWidgetInfo;
|
WidgetInfo: PWidgetInfo;
|
||||||
begin
|
begin
|
||||||
if not WSCheckHandleAllocated(ALV, 'ColumnInsert')
|
if not WSCheckHandleAllocated(ALV, 'ColumnInsert')
|
||||||
@ -557,20 +552,8 @@ begin
|
|||||||
|
|
||||||
WidgetInfo := GetWidgetInfo(PGtkWidget(ALV.Handle));
|
WidgetInfo := GetWidgetInfo(PGtkWidget(ALV.Handle));
|
||||||
|
|
||||||
if AIndex < 0 then
|
|
||||||
RealIndex := 0
|
|
||||||
else
|
|
||||||
RealIndex := AIndex * 2;
|
|
||||||
|
|
||||||
GetCommonTreeViewWidgets(PGtkWidget(ALV.Handle), Widgets);
|
GetCommonTreeViewWidgets(PGtkWidget(ALV.Handle), Widgets);
|
||||||
|
|
||||||
{if gtk_tree_model_get_n_columns(Widgets^.TreeModel) div 2 < TLVHack(ALV).Columns.Count then
|
|
||||||
begin
|
|
||||||
ReCreateListStore(ALV, PTVWidgets(Widgets^.WidgetInfo^.UserData));
|
|
||||||
ReCreateItems(ALV);
|
|
||||||
GetCommonTreeViewWidgets(PGtkWidget(ALV.Handle), Widgets);
|
|
||||||
end;}
|
|
||||||
|
|
||||||
column := gtk_tree_view_column_new();
|
column := gtk_tree_view_column_new();
|
||||||
|
|
||||||
gtk_widget_unset_flags(PGtkWidget(column), GTK_CAN_FOCUS);
|
gtk_widget_unset_flags(PGtkWidget(column), GTK_CAN_FOCUS);
|
||||||
@ -1058,7 +1041,6 @@ class function TGtk2WSCustomListView.ItemGetPosition (
|
|||||||
const ALV: TCustomListView; const AIndex: Integer ) : TPoint;
|
const ALV: TCustomListView; const AIndex: Integer ) : TPoint;
|
||||||
var
|
var
|
||||||
Widgets: PTVWidgets;
|
Widgets: PTVWidgets;
|
||||||
Iter: TGtkTreeIter;
|
|
||||||
Path: PGtkTreePath;
|
Path: PGtkTreePath;
|
||||||
ARect: TGdkRectangle;
|
ARect: TGdkRectangle;
|
||||||
Column: PGtkTreeViewColumn;
|
Column: PGtkTreeViewColumn;
|
||||||
@ -1082,14 +1064,12 @@ class function TGtk2WSCustomListView.CreateHandle(const AWinControl: TWinControl
|
|||||||
const AParams: TCreateParams): HWND;
|
const AParams: TCreateParams): HWND;
|
||||||
var
|
var
|
||||||
Widgets: PTVWidgets;
|
Widgets: PTVWidgets;
|
||||||
ListView: TCustomListView;
|
|
||||||
OrigScrollingData: PBaseScrollingWinControlData;
|
OrigScrollingData: PBaseScrollingWinControlData;
|
||||||
//ListViewData: PCustomListViewData;
|
//ListViewData: PCustomListViewData;
|
||||||
//Allocation: TGTKAllocation;
|
//Allocation: TGTKAllocation;
|
||||||
ScrollWidget: PGtkScrolledWindow;
|
ScrollWidget: PGtkScrolledWindow;
|
||||||
PtrType: GType;
|
PtrType: GType;
|
||||||
begin
|
begin
|
||||||
ListView := TCustomListView(AWinControl as TCustomListView);
|
|
||||||
|
|
||||||
Result := TGtkWSBaseScrollingWinControl.CreateHandle(AWinControl, AParams);
|
Result := TGtkWSBaseScrollingWinControl.CreateHandle(AWinControl, AParams);
|
||||||
if Result = 0 then Exit;
|
if Result = 0 then Exit;
|
||||||
|
Loading…
Reference in New Issue
Block a user