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

LCL, Win32: Refactor DoMsgColor out of TWindowProcHelper.DoWindowProc.

Browse Source 
git-svn-id: trunk@47448 -
This commit is contained in:
juha 2015-01-21 00:12:31 +00:00
parent 49aa719439
commit f2051ea603
1 changed files with 52 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
lcl/interfaces/win32/win32callback.inc
View File

@ -402,6 +402,7 @@ type
procedure DoCmdCheckBoxParam;
function DoCmdComboBoxParam: Boolean;
procedure DoMsgChar(var WinResult: LResult);
procedure DoMsgColor;
function GetPopMenuItemObject: TObject;
function GetMenuItemObject(ByPosition: Boolean): TObject;
procedure SendPaintMessage(ControlDC: HDC);
@ -1289,6 +1290,50 @@ begin
Result := False;
end;
procedure TWindowProcHelper.DoMsgColor;
begin
WindowDC := HDC(WParam);
ChildWinControl := ChildWindowInfo^.WinControl;
if ChildWinControl = nil then
ChildWinControl := ChildWindowInfo^.AWinControl;
case Msg of
WM_CTLCOLORSTATIC,
WM_CTLCOLORBTN: begin
if GetNeedParentPaint(ChildWindowInfo, ChildWinControl) and
not ChildWindowInfo^.ThemedCustomDraw then
begin
// need to draw transparently, draw background
DrawParentBackground(HWND(LParam), WindowDC);
LMessage.Result := GetStockObject(HOLLOW_BRUSH);
SetBkMode(WindowDC, TRANSPARENT);
WinProcess := false;
end;
end;
WM_CTLCOLORSCROLLBAR: begin
WinProcess := false;
end;
end;
if WinProcess then
begin
if ChildWinControl <> nil then
begin
WindowColor := ChildWinControl.Font.Color;
if WindowColor = clDefault then
WindowColor := ChildWinControl.GetDefaultColor(dctFont);
Windows.SetTextColor(WindowDC, ColorToRGB(WindowColor));
WindowColor := ChildWinControl.Brush.Color;
if WindowColor = clDefault then
WindowColor := ChildWinControl.GetDefaultColor(dctBrush);
Windows.SetBkColor(WindowDC, ColorToRGB(WindowColor));
LMessage.Result := LResult(ChildWinControl.Brush.Reference.Handle);
// Override default handling
WinProcess := false;
end;
end;
end;
// This is called from the actual WindowProc.
function TWindowProcHelper.DoWindowProc: LResult;
@ -1454,64 +1499,14 @@ begin
// others need to erased with their window color
// scrollbar also has buttons
ChildWindowInfo := GetWin32WindowInfo(HWND(LParam));
if Assigned(ChildWindowInfo^.ParentMsgHandler) then
begin
if ChildWindowInfo^.ParentMsgHandler(lWinControl,
Window, Msg, WParam, LParam, LMessage.Result, WinProcess) then Exit(LMessage.Result);
end;
WindowDC := HDC(WParam);
ChildWinControl := ChildWindowInfo^.WinControl;
if ChildWinControl = nil then
ChildWinControl := ChildWindowInfo^.AWinControl;
case Msg of
WM_CTLCOLORSTATIC,
WM_CTLCOLORBTN: begin
if GetNeedParentPaint(ChildWindowInfo, ChildWinControl) and
not ChildWindowInfo^.ThemedCustomDraw then
begin
// need to draw transparently, draw background
DrawParentBackground(HWND(LParam), WindowDC);
LMessage.Result := GetStockObject(HOLLOW_BRUSH);
SetBkMode(WindowDC, TRANSPARENT);
WinProcess := false;
end;
end;
WM_CTLCOLORSCROLLBAR: begin
WinProcess := false;
end;
end;
if WinProcess then
begin
if ChildWinControl <> nil then
begin
WindowColor := ChildWinControl.Font.Color;
if WindowColor = clDefault then
WindowColor := ChildWinControl.GetDefaultColor(dctFont);
Windows.SetTextColor(WindowDC, ColorToRGB(WindowColor));
WindowColor := ChildWinControl.Brush.Color;
if WindowColor = clDefault then
WindowColor := ChildWinControl.GetDefaultColor(dctBrush);
Windows.SetBkColor(WindowDC, ColorToRGB(WindowColor));
LMessage.Result := LResult(ChildWinControl.Brush.Reference.Handle);
// Override default handling
WinProcess := false;
end;
end;
end;
WM_CLEAR:
begin
LMessage.Msg := LM_CLEAR;
end;
WM_COPY:
begin
LMessage.Msg := LM_COPY;
end;
WM_CUT:
begin
LMessage.Msg := LM_CUT;
if Assigned(ChildWindowInfo^.ParentMsgHandler)
and ChildWindowInfo^.ParentMsgHandler(lWinControl,
Window, Msg, WParam, LParam, LMessage.Result, WinProcess) then Exit(LMessage.Result);
DoMsgColor;
end;
WM_CLEAR: LMessage.Msg := LM_CLEAR;
WM_COPY: LMessage.Msg := LM_COPY;
WM_CUT: LMessage.Msg := LM_CUT;
{$ifndef RedirectDestroyMessages}
WM_DESTROY:
begin