diff --git a/components/synedit/synedit.pp b/components/synedit/synedit.pp index 13070cc39b..0662c39bae 100644 --- a/components/synedit/synedit.pp +++ b/components/synedit/synedit.pp @@ -4448,18 +4448,16 @@ begin end; procedure TCustomSynEdit.WMDropFiles(var Msg: TMessage); -{$IFNDEF SYN_LAZARUS} -// ToDo DropFiles +{TODO: DropFiles var i, iNumberDropped: integer; szPathName: array[0..260] of char; Point: TPoint; FilesList: TStringList; -{$ENDIF} +} begin - {$IFDEF SYN_LAZARUS} LastMouseCaret:=Point(-1,-1); - {$ELSE} +{TODO: DropFiles try if Assigned(fOnDropFiles) then begin FilesList := TStringList.Create; @@ -4481,8 +4479,7 @@ begin finally Msg.Result := 0; DragFinish(THandle(Msg.wParam)); - end; - {$ENDIF} + end;} end; procedure TCustomSynEdit.WMExit(var Message: TLMExit); @@ -7736,12 +7733,9 @@ procedure TCustomSynEdit.CreateWnd; begin inherited; if (eoDropFiles in fOptions) and not (csDesigning in ComponentState) then - {$IFDEF SYN_LAZARUS} // ToDo DragAcceptFiles + //old DragAcceptFiles(Handle, TRUE); ; - {$ELSE} - DragAcceptFiles(Handle, TRUE); - {$ENDIF} SizeOrFontChanged(true); end; @@ -7754,12 +7748,9 @@ begin end; {$ENDIF} if (eoDropFiles in fOptions) and not (csDesigning in ComponentState) then begin - {$IFDEF SYN_LAZARUS} // ToDo DragAcceptFiles + //DragAcceptFiles(Handle, FALSE); ; - {$ELSE} - DragAcceptFiles(Handle, FALSE); - {$ENDIF} end; {$IFDEF EnableDoubleBuf} FreeAndNil(BufferBitmap); diff --git a/components/synedit/synedittypes.pp b/components/synedit/synedittypes.pp index 8d4e984f38..8108a67367 100644 --- a/components/synedit/synedittypes.pp +++ b/components/synedit/synedittypes.pp @@ -61,13 +61,6 @@ type TSynCoordinateMappingFlag = (scmLimitToLines, scmIncludePartVisible); TSynCoordinateMappingFlags = set of TSynCoordinateMappingFlag; - {$IFDEF SYN_LAZARUS} - // NOTE: the note below is not valid for the LCL which uses UTF-8 - {$ELSE} - //NOTE: This will need to be localized and currently will not work with - // MBCS languages like Japanese or Korean. - {$ENDIF} - PSynSelectionMode = ^TSynSelectionMode; // to be binary (clipboard) compatible with other (Delphi compiled) synedits // use {$PACKENUM 1} diff --git a/components/synedit/synhighlighterhashentries.pas b/components/synedit/synhighlighterhashentries.pas index 5fdce66f0f..1c0e80b3c9 100644 --- a/components/synedit/synhighlighterhashentries.pas +++ b/components/synedit/synhighlighterhashentries.pas @@ -98,16 +98,8 @@ type order of keyword entries is maintained. } procedure Put(HashKey: Integer; Entry: TSynHashEntry); public -{$IFDEF LIST_CLEAR_NOT_VIRTUAL} - { Overridden destructor clears the list and frees all contained keyword - entries. } - destructor Destroy; override; - { Clears the list and frees all contained keyword entries. } - procedure DeleteEntries; -{$ELSE} { Clears the list and frees all contained keyword entries. } procedure Clear; override; -{$ENDIF} public { Type-safe access to the first keyword entry for a hashvalue. } property Items[Index: integer]: TSynHashEntry read Get write Put; default; @@ -191,17 +183,7 @@ end; { TSynHashEntryList } -{$IFDEF LIST_CLEAR_NOT_VIRTUAL} -destructor TSynHashEntryList.Destroy; -begin - DeleteEntries; - inherited Destroy; -end; - -procedure TSynHashEntryList.DeleteEntries; -{$ELSE} procedure TSynHashEntryList.Clear; -{$ENDIF} var i: integer; begin diff --git a/components/synedit/syntextdrawer.pp b/components/synedit/syntextdrawer.pp index d7797ca63c..0301c08822 100644 --- a/components/synedit/syntextdrawer.pp +++ b/components/synedit/syntextdrawer.pp @@ -305,15 +305,9 @@ type function GetFontsInfoManager: TheFontsInfoManager; (* -{$IFNDEF VER93} -{$IFNDEF VER90} -{$IFNDEF VER80} {$DEFINE HE_ASSERT} {$DEFINE HE_LEADBYTES} {$DEFINE HE_COMPAREMEM} -{$ENDIF} -{$ENDIF} -{$ENDIF} *) {$IFNDEF HE_LEADBYTES} @@ -1392,16 +1386,16 @@ begin SetTextCharacterExtra(StockDC, CharExtra + FCrntDx); if IsTrueType or (not (fsItalic in Style)) then FExtTextOutProc := - {$IFDEF FPC}@{$ENDIF}TextOutOrExtTextOut + @TextOutOrExtTextOut else FExtTextOutProc := - {$IFDEF FPC}@{$ENDIF}ExtTextOutFixed; + @ExtTextOutFixed; end; True: begin FCrntDBDx := DBCHAR_CALCULATION_FALED; FExtTextOutProc := - {$IFDEF FPC}@{$ENDIF}ExtTextOutWithETO; + @ExtTextOutWithETO; end; end; end;