From 0a8bae0cd477605f1a1ba57f51ba861dd88c803c Mon Sep 17 00:00:00 2001 From: juha Date: Sat, 15 Sep 2018 21:59:00 +0000 Subject: [PATCH] LCL-GTK2: Fix TStaticText Width with Autosize. Issue #21877, patch from accorp. git-svn-id: trunk@59018 - --- lcl/interfaces/gtk2/gtk2wsstdctrls.pp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/lcl/interfaces/gtk2/gtk2wsstdctrls.pp b/lcl/interfaces/gtk2/gtk2wsstdctrls.pp index e8d6f3ac21..b8521f6ccb 100644 --- a/lcl/interfaces/gtk2/gtk2wsstdctrls.pp +++ b/lcl/interfaces/gtk2/gtk2wsstdctrls.pp @@ -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);