X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b135950383287e57c465f19879238fb7150a2fa..13b4df952c77383f50696e51fcbaa2d8bbd3b3b9:/src/motif/radiobox.cpp diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp index fa0f0dbfca..00303033a4 100644 --- a/src/motif/radiobox.cpp +++ b/src/motif/radiobox.cpp @@ -14,10 +14,6 @@ #if wxUSE_RADIOBOX -#ifdef __VMS -#define XtDisplay XTDISPLAY -#endif - #include "wx/radiobox.h" #ifndef WX_PRECOMP @@ -51,6 +47,7 @@ void wxRadioBox::Init() m_selectedButton = -1; m_noItems = 0; m_noRowsOrCols = 0; + m_labelWidget = (WXWidget) 0; } bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, @@ -61,6 +58,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, { if( !CreateControl( parent, id, pos, size, style, val, name ) ) return false; + PreCreation(); m_noItems = (unsigned int)n; m_noRowsOrCols = majorDim; @@ -123,7 +121,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, wxString str(GetLabelText(choices[i])); m_radioButtonLabels.push_back(str); Widget radioItem = XtVaCreateManagedWidget ( - wxConstCast(str.mb_str(), char), + str.mb_str(), #if wxUSE_GADGETS xmToggleButtonGadgetClass, radioBoxWidget, #else @@ -137,18 +135,15 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, (XtPointer) this); } - ChangeFont(false); - SetSelection (0); XtRealizeWidget((Widget)m_mainWidget); XtManageChild (radioBoxWidget); XtManageChild ((Widget)m_mainWidget); + PostCreation(); AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y); - ChangeBackgroundColour(); - return true; }