X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de6185e212ebc37ff11ff70278e3c4f68419b097..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/motif/radiobox.cpp?ds=sidebyside diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp index 09b06715d1..00303033a4 100644 --- a/src/motif/radiobox.cpp +++ b/src/motif/radiobox.cpp @@ -14,18 +14,13 @@ #if wxUSE_RADIOBOX -#ifdef __VMS -#define XtDisplay XTDISPLAY -#endif - #include "wx/radiobox.h" #ifndef WX_PRECOMP #include "wx/utils.h" + #include "wx/arrstr.h" #endif -#include "wx/arrstr.h" - #ifdef __VMS__ #pragma message disable nosimpint #endif @@ -52,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, @@ -62,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; @@ -77,13 +74,13 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, XmNresizeWidth, True, NULL); - wxString label1(wxStripMenuCodes(title)); + wxString label1(GetLabelText(title)); if (!label1.empty()) { wxXmString text(label1); m_labelWidget = (WXWidget) - XtVaCreateManagedWidget( label1.c_str(), + XtVaCreateManagedWidget( label1.mb_str(), #if wxUSE_GADGETS style & wxCOLOURED ? xmLabelWidgetClass : xmLabelGadgetClass, @@ -121,10 +118,10 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, int i; for (i = 0; i < n; i++) { - wxString str(wxStripMenuCodes(choices[i])); + wxString str(GetLabelText(choices[i])); m_radioButtonLabels.push_back(str); Widget radioItem = XtVaCreateManagedWidget ( - wxConstCast(str.c_str(), char), + str.mb_str(), #if wxUSE_GADGETS xmToggleButtonGadgetClass, radioBoxWidget, #else @@ -138,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; } @@ -180,7 +174,7 @@ void wxRadioBox::SetString(unsigned int item, const wxString& label) Widget widget = (Widget)m_radioButtons[item]; if (!label.empty()) { - wxString label1(wxStripMenuCodes(label)); + wxString label1(GetLabelText(label)); wxXmString text( label1 ); m_radioButtonLabels[item] = label1; XtVaSetValues (widget, @@ -352,7 +346,7 @@ void wxRadioBox::ChangeBackgroundColour() wxWindow::ChangeBackgroundColour(); wxColour colour = *wxBLACK; - int selectPixel = colour.AllocColour(XtDisplay((Widget)m_mainWidget)); + WXPixel selectPixel = colour.AllocColour(XtDisplay((Widget)m_mainWidget)); for (unsigned int i = 0; i < m_noItems; i++) {