paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-05-28 20:25:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

gtk2: cleanup

Browse Source 
git-svn-id: trunk@24689 -
This commit is contained in:
paul 2010-04-18 08:21:10 +00:00
parent e05a368a82
commit 24d98ffbae
3 changed files with 14 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lcl/interfaces/gtk2/gtk2listviewtreemodel.pas
View File

@ -68,11 +68,11 @@ type
ListView: TCustomListView;
end;
PMyTreeModelObjectClass = ^TLCLTreeModelClass;
PMyTreeModelObjectClass = ^TLCLTreeModelClass;
TLCLTreeModelClass = record
parent_class: TGObjectClass;
end;
TLVItemHack = class(TListItem)
TLVItemHack = class(TListItem)
end;
@ -96,8 +96,6 @@ begin
Result^.ListView := AListView;
end;
function LCLLISTVIEW_MODEL_TYPE: GType;
var
TypeInfo: TGTypeInfo;
@ -126,8 +124,6 @@ begin
end;
_LCLLISTVIEW_MODEL_TYPE := g_type_register_static(G_TYPE_OBJECT, 'LCLListViewModel', @TypeInfo, 0);
g_type_add_interface_static(_LCLLISTVIEW_MODEL_TYPE, GTK_TYPE_TREE_MODEL, @InterfaceInfo);
end;
Result := _LCLLISTVIEW_MODEL_TYPE;
end;
@ -172,8 +168,7 @@ end;
{ TLCLListViewModel }
procedure TLCLListViewModel.row_changed(path: PGtkTreePath; iter: PGtkTreeIter
); cdecl;
procedure TLCLListViewModel.row_changed(path: PGtkTreePath; iter: PGtkTreeIter); cdecl;
begin
end;
@ -218,7 +213,7 @@ begin
Index := gtk_tree_path_get_indices(path)[0];
if Index < ListView.Items.Count then
begin
ITer^.user_data:= Pointer(Index);
iter^.user_data:= Pointer(Index);
Exit(True);
end;
end;
@ -298,18 +293,17 @@ begin
Result := False;
if ListView = nil then
Exit;
WriteLn(PtrUInt(Iter^.user_data));
Inc(PtrUInt(Iter^.user_data));
Result := PtrUint(Iter^.user_data) < ListView.items.Count;
end;
function TLCLListViewModel.iter_children(iter: PGtkTreeIter;
parent: PGtkTreeIter): gboolean; cdecl;
function TLCLListViewModel.iter_children(iter: PGtkTreeIter; parent: PGtkTreeIter): gboolean; cdecl;
begin
Result := False;
end;
function TLCLListViewModel.iter_has_child(iter: PGtkTreeIter): gboolean;
cdecl;
function TLCLListViewModel.iter_has_child(iter: PGtkTreeIter): gboolean; cdecl;
begin
Result := false;
end;
@ -319,7 +313,6 @@ begin
Result := 0;
if (Iter = nil) and (ListView <> nil) then
Result := ListView.Items.Count;
end;
function TLCLListViewModel.iter_nth_child(iter: PGtkTreeIter;
@ -328,14 +321,14 @@ begin
Result := False;
if (ListView = nil) or (parent <> nil) then
Exit;
if (Iter = nil) and (n < ListView.Items.Count) then begin
PtrUint(Iter^.user_data):=n;
if (Iter = nil) and (n < ListView.Items.Count) then
begin
PtrUint(Iter^.user_data) := n;
Result := True;
end;
end;
function TLCLListViewModel.iter_parent(iter: PGtkTreeIter; child: PGtkTreeIter
): gboolean; cdecl;
function TLCLListViewModel.iter_parent(iter: PGtkTreeIter; child: PGtkTreeIter): gboolean; cdecl;
begin
Result := False;
end;
@ -353,8 +346,8 @@ var
Path: PGtkTreePath;
Iter: TGtkTreeIter;
begin
Iter.user_data:= Pointer(AIndex);
path :=gtk_tree_path_new_from_indices(AIndex, -1);
Iter.user_data := Pointer(AIndex);
path := gtk_tree_path_new_from_indices(AIndex, -1);
//emits a signal
gtk_tree_model_row_inserted(TreeModel, path, @iter);
gtk_tree_path_free(path);
@ -364,11 +357,10 @@ procedure TLCLListViewModel.NotifyRowDeleted(AIndex: PtrUInt);
var
Path: PGtkTreePath;
begin
path :=gtk_tree_path_new_from_indices(AIndex, -1);
path := gtk_tree_path_new_from_indices(AIndex, -1);
//emits a signal
gtk_tree_model_row_deleted(TreeModel, path);
gtk_tree_path_free(path);
end;
function TLCLListViewModel.TreeModel: PGtkTreeModel; inline;

1
lcl/interfaces/gtk2/gtk2wscomctrls.pp
View File

@ -95,7 +95,6 @@ type
class procedure SetNeedDefaultColumn(const ALV: TCustomListView; const AValue: Boolean);
class procedure AddRemoveCheckboxRenderer(const ALV: TCustomListView; const WidgetInfo: PWidgetInfo; const Add: Boolean);
class function GetViewModel(const AView: PGtkWidget): PGtkTreeModel;
class procedure RecreateMainView(ALV: TCustomListView);
protected
class procedure SetCallbacks(const AScrollWidget: PGtkWidget; const Widgets: PTVWidgets; const AWidgetInfo: PWidgetInfo); virtual;
published

32
lcl/interfaces/gtk2/gtk2wscustomlistview.inc
View File

@ -518,38 +518,6 @@ begin
Result := nil;
end;
class procedure TGtk2WSCustomListView.RecreateMainView(ALV: TCustomListView);
var
ScrollWidget: PGtkWidget;
Widgets: PTVWidgets;
Info: PWidgetInfo;
begin
GetCommonTreeViewWidgets(PGtkWidget(ALV.Handle), Widgets);
Info := GetWidgetInfo(Widgets^.MainView);
ScrollWidget := gtk_widget_get_parent(Widgets^.MainView);
g_object_ref(Widgets^.TreeModel);
gtk_widget_destroy(Widgets^.MainView);
if TLVHack(ALV).ViewStyle in [vsIcon,vsSmallIcon] then
begin
Widgets^.MainView := gtk_icon_view_new_with_model(Widgets^.TreeModel);
Widgets^.TreeSelection := nil;
end
else
begin
Widgets^.MainView := gtk_tree_view_new_with_model(Widgets^.TreeModel);
Widgets^.TreeSelection := PGtkTreeSelection(gtk_tree_view_get_selection(PGtkTreeView(Widgets^.MainView)));
end;
g_object_unref(Widgets^.TreeModel);
gtk_container_add(GTK_CONTAINER(ScrollWidget), Widgets^.MainView);
Info^.CoreWidget := Widgets^.MainView;
gtk_object_set_data(Pointer(Widgets^.MainView), 'widgetinfo', Info);
gtk_widget_show_all(Widgets^.MainView);
SetCallbacks(ScrollWidget, Widgets, Info);
end;
class procedure TGtk2WSCustomListView.SetCallbacks(const AScrollWidget: PGtkWidget;
const Widgets: PTVWidgets; const AWidgetInfo: PWidgetInfo);
begin