From 6886fcfafe4f87cdc68436770f5d7f3c9677ae15 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 11 Sep 2002 19:25:00 +0000 Subject: [PATCH] Applied [ 585322 ] motif border style fix for statictext Applied fix to broken wxStaticText git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/motif/stattext.h | 7 +++++++ src/motif/stattext.cpp | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/wx/motif/stattext.h b/include/wx/motif/stattext.h index c58bcaa7cc..e64de49452 100644 --- a/include/wx/motif/stattext.h +++ b/include/wx/motif/stattext.h @@ -56,6 +56,13 @@ public: virtual void ChangeFont(bool keepOriginalSize = TRUE); virtual void ChangeBackgroundColour(); virtual void ChangeForegroundColour(); + + // Get the widget that corresponds to the label (for font setting, label setting etc.) + virtual WXWidget GetLabelWidget() const + { return m_labelWidget; } + +protected: + WXWidget m_labelWidget; }; #endif diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp index 742fa52c76..2b4166a75a 100644 --- a/src/motif/stattext.cpp +++ b/src/motif/stattext.cpp @@ -106,7 +106,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id, XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget)); - Widget labelWidget = XtVaCreateManagedWidget ((char*) (const char*) name, + m_labelWidget = XtVaCreateManagedWidget ((char*) (const char*) name, xmLabelWidgetClass, borderWidget ? borderWidget : parentWidget, XmNfontList, fontList, @@ -119,7 +119,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id, XmStringFree (text); - m_mainWidget = borderWidget ? borderWidget : labelWidget; + m_mainWidget = borderWidget ? borderWidget : m_labelWidget; SetCanAddEventHandler(TRUE); AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y); -- 2.47.2