* Applied a patch from Vladimir moving some code out of gui_grid.pas to gfxbase.pas and getting rid of some IFDEF's in the process.

1 files changed, 49 insertions, 0 deletions

diff --git a/src/corelib/gdi/gfx_gdi.pas b/src/corelib/gdi/gfx_gdi.pas
index f284bb38..b198fa24 100644
--- a/src/corelib/gdi/gfx_gdi.pas
+++ b/src/corelib/gdi/gfx_gdi.pas
@@ -206,6 +206,14 @@ type
     procedure   InitClipboard; override;
   end;
 
+
+  { TfpgFileListImpl }
+
+  TfpgFileListImpl = class(TfpgFileListBase)
+    function    InitializeEntry(sr: TSearchRec): TFileEntry; override;
+    function    UpdateDirectory(const aDirectory: TfpgString): TfpgString; override;
+  end;
+
 implementation
 
 uses
@@ -1989,6 +1997,47 @@ begin
       );
 end;
 
+{ TfpgFileListImpl }
+
+function TfpgFileListImpl.InitializeEntry(sr: TSearchRec): TFileEntry;
+begin
+  Result := inherited InitializeEntry(sr);
+  if Assigned(Result) then
+  begin
+    Result.Name := UTF8Encode(Result.Name);
+    Result.Extention := UTF8Encode(Result.Extention);
+  end;
+end;
+
+function TfpgFileListImpl.UpdateDirectory(const aDirectory: TfpgString
+  ): TfpgString;
+var
+  n: integer;
+  drvs: string;
+begin
+  FSpecialDirs.Clear;
+  
+  // making drive list
+  if Copy(aDirectory, 2, 1) = ':' then
+  begin
+    n := 0;
+    { TODO: replace 25 with a constant: max nested directories displayed }
+    while n <= 25 do
+    begin
+      drvs := chr(n+ord('A'))+':\';
+      if Windows.GetDriveType(PChar(drvs)) <> 1 then
+      begin
+        // vvzh: to avoid doubling of drive letters in inherited UpdateDirectory
+        if Pos(drvs, aDirectory) <> 1 then
+          FSpecialDirs.Add(drvs);
+      end;
+      inc(n);
+    end;
+  end;
+
+  Result := inherited UpdateDirectory(aDirectory);
+end;
+
 initialization
   wapplication   := nil;
   MouseFocusedWH := 0;