mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-09-13 21:39:21 +02:00
Improves wince debug info and adds PageWindowProc
git-svn-id: trunk@25553 -
This commit is contained in:
parent
c1e77e3f49
commit
82f4023793
@ -65,14 +65,18 @@ function CallDefaultWindowProc(Window: HWnd; Msg: UInt; WParam: Windows.WParam;
|
|||||||
var
|
var
|
||||||
PrevWndProc: Windows.WNDPROC;
|
PrevWndProc: Windows.WNDPROC;
|
||||||
setComboWindow: boolean;
|
setComboWindow: boolean;
|
||||||
|
WindowInfo: PWindowInfo;
|
||||||
begin
|
begin
|
||||||
{$ifdef MSG_DEBUG}
|
{$ifdef MSG_DEBUG}
|
||||||
DebugLn('Trace:CallDefaultWindowProc - Start');
|
DebugLn('Trace:CallDefaultWindowProc - Start');
|
||||||
{$endif}
|
{$endif}
|
||||||
|
|
||||||
PrevWndProc := GetWindowInfo(Window)^.DefWndProc;
|
WindowInfo := GetWindowInfo(Window);
|
||||||
|
PrevWndProc := WindowInfo^.DefWndProc;
|
||||||
|
|
||||||
if (PrevWndProc = nil) or (PrevWndProc = @WindowProc) // <- prevent recursion
|
if (PrevWndProc = nil) or (PrevWndProc = @WindowProc) // <- prevent recursion
|
||||||
then begin
|
or ((WindowInfo^.WinControl <> nil) and (WindowInfo^.WinControl is TTabSheet)) then
|
||||||
|
begin
|
||||||
{$ifdef MSG_DEBUG}
|
{$ifdef MSG_DEBUG}
|
||||||
DebugLn('Trace:CallDefaultWindowProc - A');
|
DebugLn('Trace:CallDefaultWindowProc - A');
|
||||||
{$endif}
|
{$endif}
|
||||||
|
@ -288,7 +288,7 @@ end;
|
|||||||
function PageWindowProc(Window: HWnd; Msg: UInt; WParam: Windows.WParam;
|
function PageWindowProc(Window: HWnd; Msg: UInt; WParam: Windows.WParam;
|
||||||
LParam: Windows.LParam): LResult; {$ifdef win32}stdcall{$else}cdecl{$endif};
|
LParam: Windows.LParam): LResult; {$ifdef win32}stdcall{$else}cdecl{$endif};
|
||||||
begin
|
begin
|
||||||
// Result := WindowProc(Window, Msg, WParam, LParam);
|
Result := WindowProc(Window, Msg, WParam, LParam);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
class function TWinCEWSCustomPage.CreateHandle(const AWinControl: TWinControl;
|
class function TWinCEWSCustomPage.CreateHandle(const AWinControl: TWinControl;
|
||||||
@ -307,10 +307,8 @@ begin
|
|||||||
with Params do
|
with Params do
|
||||||
begin
|
begin
|
||||||
pClassName := @ClsName;
|
pClassName := @ClsName;
|
||||||
SubClassWndProc := nil;//@PageWindowProc;
|
SubClassWndProc := @PageWindowProc;
|
||||||
// Params.Flags := WS_CHILD or WS_CLIPSIBLINGS or WS_CLIPCHILDREN;
|
Flags := Flags and not WS_VISIBLE;
|
||||||
// Flags := Flags and not WS_VISIBLE;
|
|
||||||
// Params.FlagsEx := WS_EX_CONTROLPARENT;
|
|
||||||
end;
|
end;
|
||||||
// create window
|
// create window
|
||||||
FinishCreateWindow(AWinControl, Params, false);
|
FinishCreateWindow(AWinControl, Params, false);
|
||||||
|
Loading…
Reference in New Issue
Block a user