#endif
#include "wx/radiobox.h"
-#include "wx/utils.h"
-#include "wx/arrstr.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/utils.h"
+ #include "wx/arrstr.h"
+#endif
#ifdef __VMS__
#pragma message disable nosimpint
m_selectedButton = -1;
m_noItems = 0;
m_noRowsOrCols = 0;
+ m_labelWidget = (WXWidget) 0;
}
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;
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,
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
(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;
}
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,
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++)
{