Menu
▾
▴
[Synedit-checkins] SynEdit/Source SynEdit.pas,1.386.2.26,1.386.2.27 SynEditOptionsDialog.pas,1.21.2.3,1.21.2.4 SynHighlighterPas.pas,1.27.2.4,1.27.2.5 SynHighlighterRC.pas,1.6.2.4,1.6.2.5 SynUnicode.pas,1.1.2.15,1.1.2.16
Update of /cvsroot/synedit/SynEdit/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16833/Source Modified Files: Tag: Unicode_2004_08_31 SynEdit.pas SynEditOptionsDialog.pas SynHighlighterPas.pas SynHighlighterRC.pas SynUnicode.pas Log Message: Fixed some design time issues. Fixed Delphi 2005 warnings/hints. Index: SynEdit.pas =================================================================== RCS file: /cvsroot/synedit/SynEdit/Source/SynEdit.pas,v retrieving revision 1.386.2.26 retrieving revision 1.386.2.27 diff -u -d -r1.386.2.26 -r1.386.2.27 --- SynEdit.pas 14 Jun 2005 18:54:18 -0000 1.386.2.26 +++ SynEdit.pas 14 Jun 2005 22:12:45 -0000 1.386.2.27 @@ -4795,32 +4795,20 @@ procedure TCustomSynEdit.WMGetText(var Msg: TWMGetText); begin - if csDesigning in ComponentState then - begin - inherited; - exit; - end; - - if IsWindowUnicode(Handle) then + if HandleAllocated and IsWindowUnicode(Handle) then begin StrLCopyW(PWideChar(Msg.Text), PWideChar(Text), Msg.TextMax - 1); Msg.Result := StrLenW(PWideChar(Msg.Text)); end else begin - StrPLCopy(Msg.Text, Text, Msg.TextMax - 1); - Msg.Result := StrLen(Msg.Text); + StrLCopy(PAnsiChar(Msg.Text), PAnsiChar(AnsiString(Text)), Msg.TextMax - 1); + Msg.Result := StrLen(PAnsiChar(Msg.Text)); end; end; procedure TCustomSynEdit.WMGetTextLength(var Msg: TWMGetTextLength); begin - if csDesigning in ComponentState then - begin - inherited; - exit; - end; - Msg.Result := Length(Text); end; @@ -4902,18 +4890,12 @@ procedure TCustomSynEdit.WMSetText(var Msg: TWMSetText); begin - if csDesigning in ComponentState then - begin - inherited; - exit; - end; - LongBool(Msg.Result) := True; try - if IsWindowUnicode(Handle) then + if HandleAllocated and IsWindowUnicode(Handle) then Text := PWideChar(Msg.Text) else - Text := Msg.Text; + Text := PAnsiChar(Msg.Text); except LongBool(Msg.Result) := False; raise @@ -5807,29 +5789,31 @@ end; procedure TCustomSynEdit.WndProc(var Msg: TMessage); -// Prevent Alt-Backspace from beeping const ALT_KEY_DOWN = $20000000; begin - if not FWindowProducedMessage then - begin - FWindowProducedMessage := True; - if IsTextMessage(Msg.Msg) then - begin - with Msg do - Result := SendMessageA(Handle, Msg, wParam, lParam); - Exit; - end; - end; - + // Prevent Alt-Backspace from beeping if (Msg.Msg = WM_SYSCHAR) and (Msg.wParam = VK_BACK) and (Msg.lParam and ALT_KEY_DOWN <> 0) then - Msg.Msg := 0 - else - inherited; + Msg.Msg := 0; - FWindowProducedMessage := False; + // handle direct WndProc calls that could happen through VCL-methods like Perform + if HandleAllocated and IsWindowUnicode(Handle) then + if not FWindowProducedMessage then + begin + FWindowProducedMessage := True; + if IsTextMessage(Msg.Msg) then + begin + with Msg do + Result := SendMessageA(Handle, Msg, wParam, lParam); + Exit; + end; + end + else + FWindowProducedMessage := False; + + inherited; end; {$ENDIF} Index: SynUnicode.pas =================================================================== RCS file: /cvsroot/synedit/SynEdit/Source/Attic/SynUnicode.pas,v retrieving revision 1.1.2.15 retrieving revision 1.1.2.16 diff -u -d -r1.1.2.15 -r1.1.2.16 --- SynUnicode.pas 14 Jun 2005 18:54:19 -0000 1.1.2.15 +++ SynUnicode.pas 14 Jun 2005 22:12:48 -0000 1.1.2.16 @@ -3152,11 +3152,10 @@ finally Free end; - - CharMsgAlreadyUnicode := Result; {$ELSE} - CharMsgAlreadyUnicode := True; + Result := True; {$ENDIF} + CharMsgAlreadyUnicode := Result; CheckedForUnicode := True; end; {$ENDIF} Index: SynHighlighterRC.pas =================================================================== RCS file: /cvsroot/synedit/SynEdit/Source/SynHighlighterRC.pas,v retrieving revision 1.6.2.4 retrieving revision 1.6.2.5 diff -u -d -r1.6.2.4 -r1.6.2.5 --- SynHighlighterRC.pas 19 Mar 2005 13:32:18 -0000 1.6.2.4 +++ SynHighlighterRC.pas 14 Jun 2005 22:12:48 -0000 1.6.2.5 @@ -104,7 +104,7 @@ constructor Create(aOwner: TComponent); override; destructor Destroy; override; function GetDefaultAttribute(index: integer): TSynHighlighterAttributes; override; - function GetEOL: boolean; override; + function GetEol: boolean; override; function GetRange: pointer; override; function GetTokenID: TtkTokenKind; function GetTokenAttribute: TSynHighlighterAttributes; override; @@ -460,7 +460,7 @@ end; end; -function TSynRCSyn.GetEOL: boolean; +function TSynRCSyn.GetEol: boolean; begin Result := fTokenID = tkNull; end; Index: SynEditOptionsDialog.pas =================================================================== RCS file: /cvsroot/synedit/SynEdit/Source/SynEditOptionsDialog.pas,v retrieving revision 1.21.2.3 retrieving revision 1.21.2.4 diff -u -d -r1.21.2.3 -r1.21.2.4 --- SynEditOptionsDialog.pas 2 Nov 2004 14:46:32 -0000 1.21.2.3 +++ SynEditOptionsDialog.pas 14 Jun 2005 22:12:47 -0000 1.21.2.4 @@ -295,8 +295,8 @@ function GetExtended: Boolean; procedure SetExtended(const Value: Boolean); public - constructor create(AOwner : TComponent); override; - destructor destroy; override; + constructor Create(AOwner : TComponent); override; + destructor Destroy; override; function Execute(EditOptions : TSynEditorOptionsContainer) : Boolean; property Form: TfmEditorOptionsDialog read FForm; published @@ -335,8 +335,8 @@ procedure SetOptions(const Value: TSynEditorOptions); procedure SetSynGutter(const Value: TSynGutter); public - constructor create(AOwner : TComponent); override; - destructor destroy; override; + constructor Create(AOwner : TComponent); override; + destructor Destroy; override; procedure Assign(Source : TPersistent); override; procedure AssignTo(Dest : TPersistent); override; published Index: SynHighlighterPas.pas =================================================================== RCS file: /cvsroot/synedit/SynEdit/Source/SynHighlighterPas.pas,v retrieving revision 1.27.2.4 retrieving revision 1.27.2.5 diff -u -d -r1.27.2.4 -r1.27.2.5 --- SynHighlighterPas.pas 10 Jan 2005 13:50:15 -0000 1.27.2.4 +++ SynHighlighterPas.pas 14 Jun 2005 22:12:47 -0000 1.27.2.5 @@ -1148,9 +1148,11 @@ iVersions: TStringList; iVersionTag: string; begin { ReadDelphiSettings } - {$IFDEF SYN_DELPHI_7_UP} + {$IFDEF SYN_COMPILER_7_UP} + {$IFNDEF SYN_COMPILER_9_UP} Result := False; // Silence the compiler warning {$ENDIF} + {$ENDIF} iVersions := TStringList.Create; try EnumUserSettings(iVersions); |