mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-13 04:29:11 +02:00
LCL: use TFileStreamUtf8 for LoadFromFile/SaveToFile for TCocoaMemoStrings and TCarbonMemoStrings (forgotten in r46777 #001b440270 ).
git-svn-id: trunk@46779 -
This commit is contained in:
parent
ba6f0da620
commit
b3bae2ee14
@ -26,7 +26,7 @@ uses
|
|||||||
// rtl+ftl
|
// rtl+ftl
|
||||||
Classes, SysUtils,
|
Classes, SysUtils,
|
||||||
// LCL
|
// LCL
|
||||||
LCLProc, LCLType, Graphics, Controls, StdCtrls,
|
LCLProc, LCLType, Graphics, Controls, StdCtrls, LazUtf8Classes,
|
||||||
// LCL Carbon
|
// LCL Carbon
|
||||||
CarbonEdits, CarbonListViews;
|
CarbonEdits, CarbonListViews;
|
||||||
|
|
||||||
@ -93,6 +93,8 @@ type
|
|||||||
procedure Clear; override;
|
procedure Clear; override;
|
||||||
procedure Delete(Index: Integer); override;
|
procedure Delete(Index: Integer); override;
|
||||||
procedure Insert(Index: Integer; const S: string); override;
|
procedure Insert(Index: Integer; const S: string); override;
|
||||||
|
procedure LoadFromFile(const FileName: string); override;
|
||||||
|
procedure SaveToFile(const FileName: string); override;
|
||||||
public
|
public
|
||||||
property Owner: TCarbonMemo read FOwner;
|
property Owner: TCarbonMemo read FOwner;
|
||||||
end;
|
end;
|
||||||
@ -429,5 +431,29 @@ begin
|
|||||||
FOwner.InsertLine(Index, S);
|
FOwner.InsertLine(Index, S);
|
||||||
end;
|
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.
|
end.
|
||||||
|
@ -26,7 +26,8 @@ uses
|
|||||||
// Libs
|
// Libs
|
||||||
MacOSAll, CocoaAll,
|
MacOSAll, CocoaAll,
|
||||||
// LCL
|
// LCL
|
||||||
Controls, StdCtrls, Graphics, LCLType, LMessages, LCLProc, LCLMessageGlue, Classes,
|
Controls, StdCtrls, Graphics, LCLType, LMessages, LCLProc, LCLMessageGlue,
|
||||||
|
Classes, LazUtf8Classes,
|
||||||
// Widgetset
|
// Widgetset
|
||||||
WSStdCtrls, WSLCLClasses, WSControls, WSProc,
|
WSStdCtrls, WSLCLClasses, WSControls, WSProc,
|
||||||
// LCL Cocoa
|
// LCL Cocoa
|
||||||
@ -573,6 +574,8 @@ type
|
|||||||
procedure Clear; override;
|
procedure Clear; override;
|
||||||
procedure Delete(Index: Integer); override;
|
procedure Delete(Index: Integer); override;
|
||||||
procedure Insert(Index: Integer; const S: string); override;
|
procedure Insert(Index: Integer; const S: string); override;
|
||||||
|
procedure LoadFromFile(const FileName: string); override;
|
||||||
|
procedure SaveToFile(const FileName: string); override;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
{ TCocoaMemoStrings }
|
{ TCocoaMemoStrings }
|
||||||
@ -681,6 +684,30 @@ begin
|
|||||||
SetTextStr(txt)
|
SetTextStr(txt)
|
||||||
end;
|
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 }
|
{ TCocoaWSCustomMemo }
|
||||||
|
|
||||||
function MemoTextView(AWinControl: TWinControl): TCocoaTextView;
|
function MemoTextView(AWinControl: TWinControl): TCocoaTextView;
|
||||||
|
Loading…
Reference in New Issue
Block a user