Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied [ 585322 ] motif border style fix for statictext

Browse Source 
Applied fix to broken wxStaticText


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-09-11 19:25:00 +00:00
parent a8de819021
commit 6886fcfafe
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/motif/stattext.h
View File

@@ -56,6 +56,13 @@ public:
virtual void ChangeFont(bool keepOriginalSize = TRUE); virtual void ChangeFont(bool keepOriginalSize = TRUE);
virtual void ChangeBackgroundColour(); virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour(); 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 #endif

4
src/motif/stattext.cpp
View File

@@ -106,7 +106,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget)); 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, xmLabelWidgetClass,
borderWidget ? borderWidget : parentWidget, borderWidget ? borderWidget : parentWidget,
XmNfontList, fontList, XmNfontList, fontList,
@@ -119,7 +119,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
XmStringFree (text); XmStringFree (text);
m_mainWidget = borderWidget ? borderWidget : labelWidget; m_mainWidget = borderWidget ? borderWidget : m_labelWidget;
SetCanAddEventHandler(TRUE); SetCanAddEventHandler(TRUE);
AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y); AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);