paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 06:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

win32 interface: fixed range errors

Browse Source 
git-svn-id: trunk@10919 -
This commit is contained in:
vincents 2007-04-08 12:12:28 +00:00
parent c7726dfb92
commit f436ded659
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,6 +220,7 @@ Var
winClassName: array[0..19] of char; winClassName: array[0..19] of char;
WindowInfo: PWindowInfo; WindowInfo: PWindowInfo;
Flags: dword; Flags: dword;
WindowDC: HDC;
LMInsertText: TLMInsertText; // used by CB_INSERTSTRING, LB_INSERTSTRING LMInsertText: TLMInsertText; // used by CB_INSERTSTRING, LB_INSERTSTRING
LMScroll: TLMScroll; // used by WM_HSCROLL LMScroll: TLMScroll; // used by WM_HSCROLL
@ -1183,6 +1184,7 @@ begin
// only static and button controls have transparent parts // only static and button controls have transparent parts
// others need to erased with their window color // others need to erased with their window color
// scrollbar also has buttons // scrollbar also has buttons
WindowDC := HDC(WParam);
ChildWindowInfo := GetWindowInfo(HWND(LParam)); ChildWindowInfo := GetWindowInfo(HWND(LParam));
ChildWinControl := ChildWindowInfo^.WinControl; ChildWinControl := ChildWindowInfo^.WinControl;
if ChildWinControl = nil then if ChildWinControl = nil then
@ -1194,9 +1196,9 @@ begin
and not ChildWindowInfo^.ThemedCustomDraw then and not ChildWindowInfo^.ThemedCustomDraw then
begin begin
// need to draw transparently, draw background // need to draw transparently, draw background
SendParentPaintMessage(LParam, Window, WParam); SendParentPaintMessage(HWND(LParam), Window, WindowDC);
LMessage.Result := GetStockObject(HOLLOW_BRUSH); LMessage.Result := GetStockObject(HOLLOW_BRUSH);
SetBkMode(WParam, TRANSPARENT); SetBkMode(WindowDC, TRANSPARENT);
WinProcess := false; WinProcess := false;
end; end;
end; end;
@ -1209,8 +1211,8 @@ begin
begin begin
if ChildWinControl <> nil then if ChildWinControl <> nil then
begin begin
Windows.SetTextColor(HDC(WParam), Windows.COLORREF(ColorToRGB(ChildWinControl.Font.Color))); Windows.SetTextColor(WindowDC, Windows.COLORREF(ColorToRGB(ChildWinControl.Font.Color)));
Windows.SetBkColor(HDC(WParam), Windows.COLORREF(ColorToRGB(ChildWinControl.Brush.Color))); Windows.SetBkColor(WindowDC, Windows.COLORREF(ColorToRGB(ChildWinControl.Brush.Color)));
LMessage.Result := LResult(ChildWinControl.Brush.Handle); LMessage.Result := LResult(ChildWinControl.Brush.Handle);
//DebugLn(['WindowProc ', ChildWinControl.Name, ' Brush: ', LMessage.Result]); //DebugLn(['WindowProc ', ChildWinControl.Name, ' Brush: ', LMessage.Result]);
// Override default handling // Override default handling