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

SynEdit Win-IME: fix potential issue with shared edits

Browse Source 
git-svn-id: trunk@35953 -
This commit is contained in:
martin 2012-03-13 23:30:25 +00:00
parent 118c034ea5
commit 149c8660b0
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/synedit/lazsynimm.pas
View File

@ -68,8 +68,6 @@ type
FImeBlockSelection, FImeBlockSelection2: TSynEditSelection; FImeBlockSelection, FImeBlockSelection2: TSynEditSelection;
FImeMarkupSelection, FImeMarkupSelection2: TSynEditMarkupSelection; FImeMarkupSelection, FImeMarkupSelection2: TSynEditMarkupSelection;
FInImeMsg: Boolean; FInImeMsg: Boolean;
FRedoList: TSynEditUndoList;
FUndoList: TSynEditUndoList;
procedure SetImeTempText(const s: string); procedure SetImeTempText(const s: string);
procedure DoOnCommand(Sender: TObject; AfterProcessing: boolean; var Handled: boolean; procedure DoOnCommand(Sender: TObject; AfterProcessing: boolean; var Handled: boolean;
var Command: TSynEditorCommand; var AChar: TUTF8Char; Data: pointer; var Command: TSynEditorCommand; var AChar: TUTF8Char; Data: pointer;
@ -86,9 +84,6 @@ type
procedure WMImeStartComposition(var Msg: TMessage); override; procedure WMImeStartComposition(var Msg: TMessage); override;
procedure WMImeEndComposition(var Msg: TMessage); override; procedure WMImeEndComposition(var Msg: TMessage); override;
procedure FocusKilled; override; procedure FocusKilled; override;
property UndoList: TSynEditUndoList read FUndoList write FUndoList;
property RedoList: TSynEditUndoList read FRedoList write FRedoList;
end; end;
implementation implementation
@ -389,11 +384,11 @@ begin
f := FInImeMsg; f := FInImeMsg;
FInImeMsg := True; FInImeMsg := True;
fUndoList.Lock; ViewedTextBuffer.UndoList.Lock;
fRedoList.Lock; ViewedTextBuffer.RedoList.Lock;
FImeBlockSelection.SelText := s; FImeBlockSelection.SelText := s;
fUndoList.Unlock; ViewedTextBuffer.UndoList.Unlock;
fRedoList.Unlock; ViewedTextBuffer.RedoList.Unlock;
FInImeMsg := f; FInImeMsg := f;
p2 := FImeBlockSelection.FirstLineBytePos; p2 := FImeBlockSelection.FirstLineBytePos;

2
components/synedit/synedit.pp
View File

@ -1975,8 +1975,6 @@ begin
{$IFDEF WinIME} {$IFDEF WinIME}
{$IFDEF WinIMEFull} {$IFDEF WinIMEFull}
FImeHandler := LazSynImeFull.Create(Self); FImeHandler := LazSynImeFull.Create(Self);
LazSynImeFull(FImeHandler).UndoList := fUndoList;
LazSynImeFull(FImeHandler).RedoList := fRedoList;
{$ELSE} {$ELSE}
FImeHandler := LazSynImeSimple.Create(Self); FImeHandler := LazSynImeSimple.Create(Self);
LazSynImeSimple(FImeHandler).TextDrawer := FTextDrawer; LazSynImeSimple(FImeHandler).TextDrawer := FTextDrawer;