From b50c32d8668fc67fb2d68dfc06c852a85e8d1de8 Mon Sep 17 00:00:00 2001 From: skalogryz Date: Fri, 14 Apr 2017 05:25:07 +0000 Subject: [PATCH] richmemo: win32 fix the issue with not returning background color. Addressing some compiler warnings git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5836 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/richmemo/win32/win32richmemoproc.pas | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/components/richmemo/win32/win32richmemoproc.pas b/components/richmemo/win32/win32richmemoproc.pas index c7e2f9dc9..e0639a802 100644 --- a/components/richmemo/win32/win32richmemoproc.pas +++ b/components/richmemo/win32/win32richmemoproc.pas @@ -272,7 +272,8 @@ begin RichEditManager := TRichEditManager; Result := GlobalRichClass <> ''; - end; + end else + Result:=true; end; procedure CopyStringToCharArray(const s: String; var Chrs: array of Char; ChrsSize: integer); @@ -329,7 +330,7 @@ begin Params.Style := EffectsToFontStyles(fmt.dwEffects); if fmt.cbSize > sizeof(CHARFORMAT) then begin Params.HasBkClr:=(fmt.dwEffects and CFE_AUTOBACKCOLOR) = 0; - if Params.HasBkClr then Params.Color:=Params.Color; + if Params.HasBkClr then Params.BkColor:=fmt.crBackColor; Params.VScriptPos:=EffectsToVScriptPost(fmt.dwEffects); end; end; @@ -889,6 +890,7 @@ begin if soMatchCase in ASearch.Options then opt := opt or FR_MATCHCASE; if soWholeWord in ASearch.Options then opt := opt or FR_WHOLEWORD; mn := ASearch.start; + mx := 0; if soBackward in ASearch.Options then begin if ASearch.len<0 then mx := 0 else begin