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

LCL: use TFileStreamUtf8 for LoadFromFile/SaveToFile for TCocoaMemoStrings and TCarbonMemoStrings (forgotten in r46777 #001b440270 ).

Browse Source 
git-svn-id: trunk@46779 -
This commit is contained in:
bart 2014-11-07 15:06:37 +00:00
parent ba6f0da620
commit b3bae2ee14
2 changed files with 55 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lcl/interfaces/carbon/carbonstrings.pp
View File

@ -26,7 +26,7 @@ uses
// rtl+ftl
Classes, SysUtils,
// LCL
LCLProc, LCLType, Graphics, Controls, StdCtrls,
LCLProc, LCLType, Graphics, Controls, StdCtrls, LazUtf8Classes,
// LCL Carbon
CarbonEdits, CarbonListViews;
@ -93,6 +93,8 @@ type
procedure Clear; override;
procedure Delete(Index: Integer); override;
procedure Insert(Index: Integer; const S: string); override;
procedure LoadFromFile(const FileName: string); override;
procedure SaveToFile(const FileName: string); override;
public
property Owner: TCarbonMemo read FOwner;
end;
@ -429,5 +431,29 @@ begin
FOwner.InsertLine(Index, S);
end;
procedure TCarbonMemoStrings.LoadFromFile(const FileName: string);
var
TheStream: TFileStreamUTF8;
begin
TheStream:=TFileStreamUtf8.Create(FileName,fmOpenRead or fmShareDenyWrite);
try
LoadFromStream(TheStream);
finally
TheStream.Free;
end;
end;
procedure TCarbonMemoStrings.SaveToFile(const FileName: string);
var
TheStream: TFileStreamUTF8;
begin
TheStream:=TFileStreamUtf8.Create(FileName,fmCreate);
try
SaveToStream(TheStream);
finally
TheStream.Free;
end;
end;
end.

29
lcl/interfaces/cocoa/cocoawsstdctrls.pp
View File

@ -26,7 +26,8 @@ uses
// Libs
MacOSAll, CocoaAll,
// LCL
Controls, StdCtrls, Graphics, LCLType, LMessages, LCLProc, LCLMessageGlue, Classes,
Controls, StdCtrls, Graphics, LCLType, LMessages, LCLProc, LCLMessageGlue,
Classes, LazUtf8Classes,
// Widgetset
WSStdCtrls, WSLCLClasses, WSControls, WSProc,
// LCL Cocoa
@ -573,6 +574,8 @@ type
procedure Clear; override;
procedure Delete(Index: Integer); override;
procedure Insert(Index: Integer; const S: string); override;
procedure LoadFromFile(const FileName: string); override;
procedure SaveToFile(const FileName: string); override;
end;
{ TCocoaMemoStrings }
@ -681,6 +684,30 @@ begin
SetTextStr(txt)
end;
procedure TCocoaMemoStrings.LoadFromFile(const FileName: string);
var
TheStream: TFileStreamUTF8;
begin
TheStream:=TFileStreamUtf8.Create(FileName,fmOpenRead or fmShareDenyWrite);
try
LoadFromStream(TheStream);
finally
TheStream.Free;
end;
end;
procedure TCocoaMemoStrings.SaveToFile(const FileName: string);
var
TheStream: TFileStreamUTF8;
begin
TheStream:=TFileStreamUtf8.Create(FileName,fmCreate);
try
SaveToStream(TheStream);
finally
TheStream.Free;
end;
end;
{ TCocoaWSCustomMemo }
function MemoTextView(AWinControl: TWinControl): TCocoaTextView;