paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-11 10:40:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

* gtk2: remove unnecesary begin/endupdate & other cleanup

Browse Source 
git-svn-id: trunk@23348 -
This commit is contained in:
marc 2010-01-02 18:59:39 +00:00
parent 56ade4e781
commit eacdf95a0f
1 changed files with 22 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
lcl/interfaces/gtk2/gtk2int.pas
View File

@ -311,23 +311,19 @@ function TGtkListStoreStringList.IsEqual(List: TStrings): Boolean;
var
i, Cnt: Integer;
begin
if List = Self then
begin
Result := True;
Exit;
end;
Result := False;
if List = nil then Exit;
if List = Self then Exit(True);
if List = nil then Exit(False);
BeginUpdate;
Cnt := Count;
if (Cnt <> List.Count) then Exit;
if (Cnt <> List.Count) then Exit(False);
for i := 0 to Cnt - 1 do
if (Strings[i] <> List[i]) or (Objects[i] <> List.Objects[i]) then Exit;
begin
if Strings[i] <> List[i] then Exit(False);
if Objects[i] <> List.Objects[i] then Exit(False);
end;
Result := True;
EndUpdate;
end;
procedure TGtkListStoreStringList.BeginUpdate;
@ -426,20 +422,18 @@ begin
Result := Item;
g_free(Item);
end;
function TGtkListStoreStringList.GetObject(Index: Integer): TObject;
var
ListItem: TGtkTreeIter;
begin
Result := nil;
if (Index < 0) or (Index >= Count)
if (Index < 0) or (Index >= Count)
then begin
RaiseGDBException('TGtkListStoreStringList.GetObject Out of bounds.');
Exit;
Exit(nil);
end;
if FGtkListStore = nil then Exit;
if FGtkListStore = nil then Exit(nil);
UpdateItemCache;
ListItem := FCachedItems[Index];
@ -613,39 +607,22 @@ end;
procedure TGtkListStoreStringList.Insert(Index: Integer; const S: String);
var
li: TGtkTreeIter;
l, m, r, cmp: Integer;
LCLIndex: PInteger;
{procedure TestNewItem;
var
Item: PChar;
CurString: String;
begin
Item := nil;
gtk_tree_model_get(GTK_TREE_MODEL(FGtkListStore), @li,
[FColumnIndex, @Item, -1]);
if (Item <> nil) then begin
CurString:= StrPas(Item);
DebugLn(['TestNewItem NewItem="',dbgstr(CurString),'"']);
g_free(Item);
if (not (glsItemCacheNeedsUpdate in FStates))
and (not CompareMem(@li,@FCachedItems[Index],SizeOf(li))) then begin
DebugLn(['TestNewItem Cache item invalid: Index=',Index]);
end;
end
else
DebugLn(['TestNewItem FAILED: new item missing']);
end;}
begin
if (Index < 0) or (Index > Count)
then begin
RaiseGDBException('TGtkListStoreStringList.Insert: Index ' + IntToStr(Index) + ' out of bounds. Count=' + IntToStr(Count));
Exit;
end;
if Owner = nil
then begin
RaiseGDBException('TGtkListStoreStringList.Insert Unspecified owner');
Exit;
end;
BeginUpdate;
try
if (Index < 0) or (Index > Count)
then RaiseGDBException('TGtkListStoreStringList.Insert: Index ' + IntToStr(Index) + ' out of bounds. Count=' + IntToStr(Count));
if Owner = nil
then RaiseGDBException('TGtkListStoreStringList.Insert Unspecified owner');
// this call is few times faster than gtk_list_store_insert, gtk_list_store_set
gtk_list_store_insert_with_values(FGtkListStore, @li, Index, FColumnIndex, PChar(S), -1);
IncreaseChangeStamp;
@ -675,8 +652,6 @@ begin
end
else
Include(FStates, glsItemCacheNeedsUpdate);
//TestNewItem;
finally
EndUpdate;
end;