X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..8219f7f98211cdf964466d130fd71a87e2282682:/src/motif/statbox.cpp?ds=sidebyside diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp index 6c96295e52..2ea22aee4d 100644 --- a/src/motif/statbox.cpp +++ b/src/motif/statbox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbox.cpp +// Name: src/motif/statbox.cpp // Purpose: wxStaticBox // Author: Julian Smart // Modified by: @@ -12,14 +12,11 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifdef __VMS -#define XtDisplay XTDISPLAY -#endif - -#include "wx/defs.h" - #include "wx/statbox.h" -#include "wx/utils.h" + +#ifndef WX_PRECOMP + #include "wx/utils.h" +#endif #ifdef __VMS__ #pragma message disable nosimpint @@ -32,8 +29,6 @@ #include "wx/motif/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) - BEGIN_EVENT_TABLE(wxStaticBox, wxControl) //EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground) END_EVENT_TABLE() @@ -92,6 +87,8 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id, if( !CreateControl( parent, id, pos, size, style, wxDefaultValidator, name ) ) return false; + m_labelWidget = (WXWidget) 0; + PreCreation(); Widget parentWidget = (Widget) parent->GetClientWidget(); @@ -101,10 +98,9 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id, // XmNshadowType, XmSHADOW_IN, NULL); - bool hasLabel = (!label.IsNull() && !label.IsEmpty()) ; - if (hasLabel) + if (!label.empty()) { - wxString label1(wxStripMenuCodes(label)); + wxString label1(GetLabelText(label)); wxXmString text(label1); Display* dpy = XtDisplay( parentWidget ); @@ -115,13 +111,13 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id, #if wxCHECK_MOTIF_VERSION( 2, 0 ) XmNframeChildType, XmFRAME_TITLE_CHILD, #else - XmNchildType, XmFRAME_TITLE_CHILD, + XmNchildType, XmFRAME_TITLE_CHILD, #endif NULL); } - + + PostCreation(); AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y); - ChangeBackgroundColour(); return true; }