LCL-GTK2: Fix TStaticText Width with Autosize. Issue #21877

git-svn-id: branches/fixes_2_0@59069 -
This commit is contained in:
mattias 2018-09-19 09:08:31 +00:00
parent 6c36017249
commit 70c4ffef23

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);