pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

richmemo: win32 fix the issue with not returning background color. Addressing some compiler warnings

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5836 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
skalogryz
2017-04-14 05:25:07 +00:00
parent 02d0e9cc25
commit b50c32d866
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/richmemo/win32/win32richmemoproc.pas
View File

@ -272,7 +272,8 @@ begin
RichEditManager := TRichEditManager; RichEditManager := TRichEditManager;
Result := GlobalRichClass <> ''; Result := GlobalRichClass <> '';
end; end else
Result:=true;
end; end;
procedure CopyStringToCharArray(const s: String; var Chrs: array of Char; ChrsSize: integer); procedure CopyStringToCharArray(const s: String; var Chrs: array of Char; ChrsSize: integer);
@ -329,7 +330,7 @@ begin
Params.Style := EffectsToFontStyles(fmt.dwEffects); Params.Style := EffectsToFontStyles(fmt.dwEffects);
if fmt.cbSize > sizeof(CHARFORMAT) then begin if fmt.cbSize > sizeof(CHARFORMAT) then begin
Params.HasBkClr:=(fmt.dwEffects and CFE_AUTOBACKCOLOR) = 0; 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); Params.VScriptPos:=EffectsToVScriptPost(fmt.dwEffects);
end; end;
end; end;
@ -889,6 +890,7 @@ begin
if soMatchCase in ASearch.Options then opt := opt or FR_MATCHCASE; if soMatchCase in ASearch.Options then opt := opt or FR_MATCHCASE;
if soWholeWord in ASearch.Options then opt := opt or FR_WHOLEWORD; if soWholeWord in ASearch.Options then opt := opt or FR_WHOLEWORD;
mn := ASearch.start; mn := ASearch.start;
mx := 0;
if soBackward in ASearch.Options then begin if soBackward in ASearch.Options then begin
if ASearch.len<0 then mx := 0 if ASearch.len<0 then mx := 0
else begin else begin