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

LCL-GTK2: Fix TStaticText Width with Autosize. Issue #21877, patch from accorp.

Browse Source 
git-svn-id: trunk@59018 -
This commit is contained in:
juha 2018-09-15 21:59:00 +00:00
parent 4590a4f178
commit 0a8bae0cd4
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lcl/interfaces/gtk2/gtk2wsstdctrls.pp
View File

@ -2938,8 +2938,6 @@ class procedure TGtk2WSCustomStaticText.SetText(const AWinControl: TWinControl;
var
FrameWidget: PGtkFrame;
LblWidget: PGtkLabel;
DC: HDC;
ALabel: PChar;
begin
if not WSCheckHandleAllocated(AWincontrol, 'SetText')
then Exit;
@ -2948,14 +2946,8 @@ begin
LblWidget := GetLabelWidget(FrameWidget);
if TStaticText(AWinControl).ShowAccelChar and (AText <> '') then
begin
DC := Widgetset.GetDC(HWND({%H-}PtrUInt(LblWidget)));
ALabel := TGtk2WidgetSet(WidgetSet).ForceLineBreaks(
DC, PChar(AText), TStaticText(AWinControl).Width, false);
Widgetset.DeleteDC(DC);
Gtk2WidgetSet.SetLabelCaption(LblWidget, ALabel);
StrDispose(ALabel);
end else
Gtk2WidgetSet.SetLabelCaption(LblWidget, AText)
else
begin
gtk_label_set_text(LblWidget, PChar(AText));
gtk_label_set_pattern(LblWidget, nil);