pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

Merge fixes from 4.8 branch to trunk

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2788 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
blikblum
2013-09-07 19:08:28 +00:00
parent d40caa283a
commit d67d6d0a63
56 changed files with 2436 additions and 1236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/virtualtreeview-new/trunk/demos/advanced/DrawTreeDemo.pas
View File

@ -20,8 +20,8 @@ uses
{$ifdef Windows}
Windows,
{$endif}
LCLIntf, delphicompat, LCLType, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
VirtualTrees, StdCtrls, ComCtrls, shlobjext, LResources;
LCLIntf, delphicompat, LCLType, SysUtils, Classes, ComCtrls, Graphics, Controls, Forms, Dialogs,
VirtualTrees, StdCtrls, shlobjext, LResources, FileUtil;
type
TDrawTreeForm = class(TForm)
@ -96,10 +96,10 @@ var
SR: TSearchRec;
begin
Result := FindFirst(IncludeTrailingPathDelimiter(Folder) + {$ifdef Windows}'*.*'{$else}'*'{$endif},
Result := FindFirstUTF8(IncludeTrailingPathDelimiter(Folder) + {$ifdef Windows}'*.*'{$else}'*'{$endif},
faAnyFile, SR) = 0;
if Result then
FindClose(SR);
FindCloseUTF8(SR);
end;
//----------------------------------------------------------------------------------------------------------------------
@ -529,7 +529,7 @@ var
begin
Data := Sender.GetNodeData(Node);
if FindFirst(IncludeTrailingPathDelimiter(Data.FullPath) + {$ifdef Windows}'*.*'{$else}'*'{$endif},
if FindFirstUTF8(IncludeTrailingPathDelimiter(Data.FullPath) + {$ifdef Windows}'*.*'{$else}'*'{$endif},
faAnyFile, SR) = 0 then
begin
Screen.Cursor := crHourGlass;
@ -554,14 +554,14 @@ begin
Sender.ValidateNode(Node, False);
end;
end;
until FindNext(SR) <> 0;
until FindNextUTF8(SR) <> 0;
ChildCount := Sender.ChildCount[Node];
// finally sort node
if ChildCount > 0 then
Sender.Sort(Node, 0, TVirtualStringTree(Sender).Header.SortDirection, False);
finally
FindClose(SR);
FindCloseUTF8(SR);
Screen.Cursor := crDefault;
end;
end;