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

* Fixed setting of TWincontrol.Text during load

Browse Source 
git-svn-id: trunk@5418 -
This commit is contained in:
marc 2004-04-20 23:39:01 +00:00
parent 420ceca785
commit f99fce8943
3 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lcl/controls.pp
View File

@ -748,7 +748,6 @@ type
FTabOrder: integer;
FTabStop : Boolean;
FTBDockHeight: Integer;
FText : TCaption;
FTop: Integer;
FUndockHeight: Integer;
FUndockWidth: Integer;
@ -2261,6 +2260,9 @@ end.
{ =============================================================================
$Log$
Revision 1.197 2004/04/20 23:39:01 marc
* Fixed setting of TWincontrol.Text during load
Revision 1.196 2004/04/18 23:55:39 marc
* Applied patch from Ladislav Michl
* Changed the way TControl.Text is resolved

3
lcl/include/customlabel.inc
View File

@ -185,6 +185,9 @@ end;
{ =============================================================================
$Log$
Revision 1.15 2004/04/20 23:39:01 marc
* Fixed setting of TWincontrol.Text during load
Revision 1.14 2004/04/10 17:58:57 mattias
implemented mainunit hints for include files

24
lcl/include/wincontrol.inc
View File

@ -2083,7 +2083,7 @@ begin
FillChar(Params, SizeOf(Params),0);
with Params do
begin
Caption := @FText;
Caption := @FCaption;
Style := WS_CHILD or WS_CLIPSIBLINGS;
if (Parent <> nil) then WndParent := Parent.Handle;
end;
@ -3061,7 +3061,7 @@ begin
Assert(False, Format('Trace:[TWinControl.InitializeWnd] %s', [ClassName]));
// set all cached properties
//writeln('[TWinControl.InitializeWnd] ',Name,':',ClassName,' ',Left,',',Top,',',Width,',',Height);
//writeln('[TWinControl.InitializeWnd] ',Name,':',ClassName,':', FCaption,' ',Left,',',Top,',',Width,',',Height);
DoSendBoundsToInterface;
CNSendMessage(LM_SHOWHIDE, Self, nil);
@ -3074,7 +3074,9 @@ begin
EnableWindow(Handle, Enabled);
RealSetText(FCaption);
// Delay the setting of text until it is complete loaded
if not (csLoading in ComponentState)
then TWSWinControlClass(WidgetSetClass).SetText(Self, FCaption);
SetProp(Handle,'WinControl',TWinControl(Self));
SetProp(Handle,'Control',TControl(Self));
@ -3116,12 +3118,20 @@ begin
inherited Loaded;
RealizeBounds;
FixupTabList;
if ([wcfColorChanged,wcfFontChanged]*FFlags<>[]) and HandleAllocated then
if HandleAllocated
then begin
// Set cached caption
TWSWinControlClass(WidgetSetClass).SetText(Self, FCaption);
if [wcfColorChanged,wcfFontChanged]*FFlags<>[] then
begin
// ToDo: replace by update style call
CNSendMessage(LM_SETCOLOR, Self, nil);
FFlags:=FFlags-[wcfColorChanged,wcfFontChanged];
end;
end;
// align the childs
if wcfReAlignNeeded in FFlags then
ReAlign;
@ -3342,7 +3352,8 @@ end;
------------------------------------------------------------------------------}
procedure TWinControl.RealSetText(const Value: TCaption);
begin
if HandleAllocated and (not (csLoading in ComponentState))
if HandleAllocated
and (not (csLoading in ComponentState))
then TWSWinControlClass(WidgetSetClass).SetText(Self, Value);
inherited;
end;
@ -3460,6 +3471,9 @@ end;
{ =============================================================================
$Log$
Revision 1.220 2004/04/20 23:39:01 marc
* Fixed setting of TWincontrol.Text during load
Revision 1.219 2004/04/18 23:55:39 marc
* Applied patch from Ladislav Michl
* Changed the way TControl.Text is resolved