X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7520f3da332d64a676b6f7d27a56004fabf2db36..9534d0dfdc3c6fad8ea5d5fd31bbb6f20650929b:/src/motif/statbox.cpp?ds=sidebyside diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp index 744db44731..22deeec8c9 100644 --- a/src/motif/statbox.cpp +++ b/src/motif/statbox.cpp @@ -17,7 +17,10 @@ #endif #include "wx/statbox.h" -#include "wx/utils.h" + +#ifndef WX_PRECOMP + #include "wx/utils.h" +#endif #ifdef __VMS__ #pragma message disable nosimpint @@ -90,6 +93,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,7 +106,7 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id, if (!label.empty()) { - wxString label1(wxStripMenuCodes(label)); + wxString label1(GetLabelText(label)); wxXmString text(label1); Display* dpy = XtDisplay( parentWidget ); @@ -116,9 +121,9 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id, #endif NULL); } - + + PostCreation(); AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y); - ChangeBackgroundColour(); return true; }