X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de6185e212ebc37ff11ff70278e3c4f68419b097..089e95217e26509f2c1a51ba490a5dd0bad22a96:/src/motif/statbox.cpp?ds=sidebyside diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp index f6d4fa2b5e..6fdcb4c5d2 100644 --- a/src/motif/statbox.cpp +++ b/src/motif/statbox.cpp @@ -12,10 +12,6 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifdef __VMS -#define XtDisplay XTDISPLAY -#endif - #include "wx/statbox.h" #ifndef WX_PRECOMP @@ -93,6 +89,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(); @@ -104,7 +102,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 ); @@ -119,9 +117,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; }