From fda3173bd366c29e481076392290890fa3d9f696 Mon Sep 17 00:00:00 2001 From: sekelsenmat Date: Wed, 19 May 2010 08:44:47 +0000 Subject: [PATCH] Improves wince debug info git-svn-id: trunk@25508 - --- lcl/interfaces/wince/wincecallback.inc | 6 +++--- lcl/interfaces/wince/winceobject.inc | 4 ++-- lcl/interfaces/wince/winceproc.pp | 4 ++-- lcl/interfaces/wince/wincewinapi.inc | 1 + lcl/interfaces/wince/wincewscontrols.pp | 2 +- lcl/interfaces/wince/wincewsdialogs.pp | 2 +- lcl/interfaces/wince/wincewsextctrls.pp | 4 +++- lcl/interfaces/wince/wincewsforms.pp | 2 +- lcl/interfaces/wince/wincewsstdctrls.pp | 8 ++++---- 9 files changed, 18 insertions(+), 15 deletions(-) diff --git a/lcl/interfaces/wince/wincecallback.inc b/lcl/interfaces/wince/wincecallback.inc index e821fc6c7d..069c50a743 100644 --- a/lcl/interfaces/wince/wincecallback.inc +++ b/lcl/interfaces/wince/wincecallback.inc @@ -2287,7 +2287,7 @@ begin if (PLMsg^.Result <> 0) then begin {$ifdef MSG_DEBUG} - writeln(MessageStackDepth, ' *ignore next character'); + DebugLn(MessageStackDepth, ' *ignore next character'); {$endif} IgnoreNextCharWindow := Window; end else begin @@ -2295,7 +2295,7 @@ begin // assume WM_CHAR is always preceded by WM_KEYDOWN {$ifdef MSG_DEBUG} if IgnoreNextCharWindow <> 0 then - writeln(MessageStackDepth, ' *stop ignoring next character'); + DebugLn(MessageStackDepth, ' *stop ignoring next character'); {$endif} IgnoreNextCharWindow := 0; end; @@ -2353,7 +2353,7 @@ var PLMsg: PLMessage; begin {$ifdef VerboseWinCE} - WriteLn('WindowProc: Msg = ' + IntToStr(Msg)); + DebugLn('WindowProc: Msg = ' + IntToStr(Msg)); {$endif} Result := 0; diff --git a/lcl/interfaces/wince/winceobject.inc b/lcl/interfaces/wince/winceobject.inc index 5fe71072c0..a628cfa8f7 100644 --- a/lcl/interfaces/wince/winceobject.inc +++ b/lcl/interfaces/wince/winceobject.inc @@ -121,12 +121,12 @@ var // Flags : integer; begin {$ifdef VerboseWinCE} - WriteLn('TWinCEWidgetSet.AppInit'); + DebugLn('TWinCEWidgetSet.AppInit'); {$endif} if not WinRegister then begin - WriteLn('TWinCEWidgetSet.AppInit failed.'); + DebugLn('TWinCEWidgetSet.AppInit failed.'); Exit; end; diff --git a/lcl/interfaces/wince/winceproc.pp b/lcl/interfaces/wince/winceproc.pp index 42b4f20710..36dca89c53 100644 --- a/lcl/interfaces/wince/winceproc.pp +++ b/lcl/interfaces/wince/winceproc.pp @@ -418,7 +418,7 @@ Begin Case IsConsole Of True: Begin - WriteLn(rsWin32Warning, Message); + DebugLn(rsWin32Warning, Message); End; False: Begin @@ -431,7 +431,7 @@ Begin Case IsConsole Of True: Begin - WriteLn(rsWin32Error, Message); + DebugLn(rsWin32Error, Message); End; False: Begin diff --git a/lcl/interfaces/wince/wincewinapi.inc b/lcl/interfaces/wince/wincewinapi.inc index c826deff85..f0e6c75b1a 100644 --- a/lcl/interfaces/wince/wincewinapi.inc +++ b/lcl/interfaces/wince/wincewinapi.inc @@ -2501,6 +2501,7 @@ end; function TWinCEWidgetSet.RectVisible(dc : hdc; const ARect: TRect) : Boolean; begin Result := Boolean(Windows.RectVisible(DC, LPRECT(@ARect)^)); +// Result := True; {$ifdef DEBUG_WINDOW_ORG} DbgAppendToFile(ExtractFilePath(ParamStr(0)) + '1.log', Format(':> [TWinCEWidgetSet.RectVisible] Result=%d', diff --git a/lcl/interfaces/wince/wincewscontrols.pp b/lcl/interfaces/wince/wincewscontrols.pp index 97b6d30f55..66da725241 100644 --- a/lcl/interfaces/wince/wincewscontrols.pp +++ b/lcl/interfaces/wince/wincewscontrols.pp @@ -281,7 +281,7 @@ var Params: TCreateWindowExParams; begin {$ifdef VerboseWinCE} - writeln(' TWinCEWSWinControl.CreateHandle '); + DebugLn(' TWinCEWSWinControl.CreateHandle '); {$endif} // general initialization of Params PrepareCreateWindow(AWinControl, AParams, Params); diff --git a/lcl/interfaces/wince/wincewsdialogs.pp b/lcl/interfaces/wince/wincewsdialogs.pp index 18875c7a17..6036bc0dc2 100644 --- a/lcl/interfaces/wince/wincewsdialogs.pp +++ b/lcl/interfaces/wince/wincewsdialogs.pp @@ -152,7 +152,7 @@ begin LCLDialog := ALCLDialog; {$ifdef VerboseWinCE} - WriteLn(':>TWinCEFileDialogForm.Create Width=', Width, + DebugLn(':>TWinCEFileDialogForm.Create Width=', Width, ' Height=', Height); {$endif} diff --git a/lcl/interfaces/wince/wincewsextctrls.pp b/lcl/interfaces/wince/wincewsextctrls.pp index a02216b383..033afad2bc 100644 --- a/lcl/interfaces/wince/wincewsextctrls.pp +++ b/lcl/interfaces/wince/wincewsextctrls.pp @@ -299,8 +299,10 @@ begin with Params do begin pClassName := @ClsName; -// Flags := Flags and not WS_VISIBLE; SubClassWndProc := nil; +// Params.Flags := WS_CHILD or WS_CLIPSIBLINGS or WS_CLIPCHILDREN; +// Flags := Flags and not WS_VISIBLE; +// Params.FlagsEx := WS_EX_CONTROLPARENT; end; // create window FinishCreateWindow(AWinControl, Params, false); diff --git a/lcl/interfaces/wince/wincewsforms.pp b/lcl/interfaces/wince/wincewsforms.pp index 2072830593..f4ea221705 100644 --- a/lcl/interfaces/wince/wincewsforms.pp +++ b/lcl/interfaces/wince/wincewsforms.pp @@ -265,7 +265,7 @@ var Bounds: TRect; begin {$ifdef VerboseWinCE} - WriteLn('TWinCEWSCustomForm.CreateHandle'); + DebugLn('TWinCEWSCustomForm.CreateHandle'); {$endif} // general initialization of Params PrepareCreateWindow(AWinControl, AParams, Params); diff --git a/lcl/interfaces/wince/wincewsstdctrls.pp b/lcl/interfaces/wince/wincewsstdctrls.pp index 415a506a70..b25851ef5e 100644 --- a/lcl/interfaces/wince/wincewsstdctrls.pp +++ b/lcl/interfaces/wince/wincewsstdctrls.pp @@ -1185,7 +1185,7 @@ var Params: TCreateWindowExParams; begin {$ifdef VerboseWinCE} - WriteLn('TWinCEWSButton.CreateHandle'); + DebugLn('TWinCEWSButton.CreateHandle'); {$endif} // general initialization of Params @@ -1205,7 +1205,7 @@ begin Result := Params.Window; {$ifdef VerboseWinCE} - WriteLn('End Create Button. Handle = ' + IntToStr(Result) + + DebugLn('End Create Button. Handle = ' + IntToStr(Result) + ' Left ' + IntToStr(AWinControl.Left) + ' Top ' + IntToStr(AWinControl.Top) + ' Width ' + IntToStr(AWinControl.Width) + @@ -1222,7 +1222,7 @@ var Params: TCreateWindowExParams; begin {$ifdef VerboseWinCE} - WriteLn('TWinCEWSCustomCheckBox.CreateHandle'); + DebugLn('TWinCEWSCustomCheckBox.CreateHandle'); {$endif} // general initialization of Params PrepareCreateWindow(AWinControl, AParams, Params); @@ -1317,7 +1317,7 @@ var Params: TCreateWindowExParams; begin {$ifdef VerboseWinCE} - WriteLn('TWinCEWSRadioButton.CreateHandle'); + DebugLn('TWinCEWSRadioButton.CreateHandle'); {$endif} // general initialization of Params