diff --git a/lcl/include/wincontrol.inc b/lcl/include/wincontrol.inc index 60e39a1650..40b106231c 100644 --- a/lcl/include/wincontrol.inc +++ b/lcl/include/wincontrol.inc @@ -7847,7 +7847,7 @@ var NewBounds: TRect; OldClientRect: TRect; NewClientRect: TRect; - {$IF defined(VerboseResizeFlicker)} + {$IF defined(VerboseResizeFlicker) or defined(VerboseSizeMsg)} OldBounds: TRect; {$ENDIF} begin @@ -7863,7 +7863,7 @@ begin exit; end; NewBounds:=Bounds(Left, Top, Width, Height); - {$IF defined(VerboseResizeFlicker)} + {$IF defined(VerboseResizeFlicker) or defined(VerboseSizeMsg)} if HandleAllocated then begin GetWindowRelativePosition(Handle,OldBounds.Left,OldBounds.Top); GetWindowSize(Handle,OldBounds.Right,OldBounds.Bottom); diff --git a/lcl/interfaces/wince/wincelclintf.inc b/lcl/interfaces/wince/wincelclintf.inc index ac0127e181..ca94b60249 100644 --- a/lcl/interfaces/wince/wincelclintf.inc +++ b/lcl/interfaces/wince/wincelclintf.inc @@ -505,7 +505,7 @@ begin if SizeConstraints.Control is TCustomComboBox then begin // wince combo (but not csSimple) has fixed height - FixedHeight := TCustomComboBox(SizeConstraints.Control).Style <> csSimple; +// FixedHeight := TCustomComboBox(SizeConstraints.Control).Style <> csSimple; end; {if SizeConstraints.Control is TCustomCalendar then diff --git a/lcl/interfaces/wince/wincewscontrols.pp b/lcl/interfaces/wince/wincewscontrols.pp index 0996fa5e35..97b6d30f55 100644 --- a/lcl/interfaces/wince/wincewscontrols.pp +++ b/lcl/interfaces/wince/wincewscontrols.pp @@ -176,7 +176,8 @@ begin FlagsEx := FlagsEx or WS_EX_CLIENTEDGE; {$IFDEF VerboseSizeMsg} - writeln('PrepareCreateWindow ',AWinControl.Name,':',AWinControl.ClassName,' ',Left,',',Top,',',Width,',',Height); + Debugln('PrepareCreateWindow ',AWinControl.Name,':',AWinControl.ClassName, + ' ',dbgs(Left),',',dbgs(Top),',',dbgs(Width),',',dbgs(Height)); {$ENDIF} end; end; @@ -395,9 +396,9 @@ begin IntfWidth := AWidth; IntfHeight := AHeight; LCLBoundsToWin32Bounds(AWinControl, IntfLeft, IntfTop, IntfWidth, IntfHeight); {$IFDEF VerboseSizeMsg} - writeln('TWinCEWSWinControl.ResizeWindow A ',AWinControl.Name,':',AWinControl.ClassName, - ' LCL=',ALeft,',',ATop,',',AWidth,',',AHeight, - ' Win32=',IntfLeft,',',IntfTop,',',IntfWidth,',',IntfHeight, + Debugln('TWinCEWSWinControl.ResizeWindow A ',AWinControl.Name,':',AWinControl.ClassName, + ' LCL=',dbgs(ALeft),',',dbgs(ATop),',',dbgs(AWidth)+','+dbgs(AHeight), + ' Win32=',dbgs(IntfLeft)+','+dbgs(IntfTop)+','+dbgs(IntfWidth),',',dbgs(IntfHeight), ''); {$ENDIF} suppressMove := false; diff --git a/lcl/lclproc.pas b/lcl/lclproc.pas index ff918857f6..1679735609 100644 --- a/lcl/lclproc.pas +++ b/lcl/lclproc.pas @@ -261,6 +261,7 @@ procedure DebuglnThreadLog(Args: array of const); overload; procedure DebuglnThreadLog; overload; procedure DbgSaveData(FileName: String; AData: PChar; ADataSize: PtrUInt); procedure DbgAppendToFile(FileName, S: String); +procedure DbgAppendToFileWithoutLn(FileName, S: String); procedure CloseDebugOutput; @@ -2133,8 +2134,12 @@ end; procedure DebugLn(const s: string); begin + {$ifdef WinCE} + DbgAppendToFile(ExtractFilePath(ParamStr(0)) + '1.log', s); + {$else} if not Assigned(DebugText) then exit; writeln(DebugText^, ConvertLineEndings(s)); + {$endif} end; procedure DebugLn(const s1, s2: string); @@ -2251,8 +2256,12 @@ end; procedure DBGOut(const s: string); begin + {$ifdef WinCE} + DbgAppendToFileWithoutLn(ExtractFilePath(ParamStr(0)) + '1.log', s); + {$else} if Assigned(DebugText) then write(DebugText^, s); + {$endif} end; procedure DBGOut(const s1, s2: string); @@ -2893,6 +2902,20 @@ begin CloseFile(F); end; +procedure DbgAppendToFileWithoutLn(FileName, S: String); +var + F: TextFile; +begin + AssignFile(F, FileName); + {$I-} + Append(F); + if IOResult <> 0 then + Rewrite(F); + {$I+} + Write(F, S); + CloseFile(F); +end; + function StripLN(const ALine: String): String; var idx: Integer;