m_majorDim = majorDim ;
Widget parentWidget = (Widget) parent->GetClientWidget();
+ Display* dpy = XtDisplay(parentWidget);
m_mainWidget = XtVaCreateWidget ("radioboxframe",
- xmFrameWidgetClass, parentWidget,
- XmNresizeHeight, True,
- XmNresizeWidth, True,
- NULL);
+ xmFrameWidgetClass, parentWidget,
+ XmNresizeHeight, True,
+ XmNresizeWidth, True,
+ NULL);
wxString label1(wxStripMenuCodes(title));
- WXFontType fontType = m_font.GetFontType(XtDisplay(parentWidget));
-
- if (label1 != "")
+ if (!label1.empty())
{
wxXmString text(label1);
m_labelWidget = (WXWidget)
XtVaCreateManagedWidget( label1.c_str(),
#if wxUSE_GADGETS
- style & wxCOLOURED ? xmLabelWidgetClass
- : xmLabelGadgetClass,
- (Widget)m_mainWidget,
+ style & wxCOLOURED ? xmLabelWidgetClass
+ : xmLabelGadgetClass,
+ (Widget)m_mainWidget,
#else
- xmLabelWidgetClass,
- (Widget)m_mainWidget,
+ xmLabelWidgetClass, (Widget)m_mainWidget,
#endif
- wxFont::GetFontTag(), fontType,
- XmNlabelString, text(),
+ wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
+ XmNlabelString, text(),
// XmNframeChildType is not in Motif 1.2, nor in Lesstif,
// if it was compiled with 1.2 compatibility
// TODO: check this still looks OK for Motif 1.2.
#if (XmVersion > 1200)
- XmNframeChildType, XmFRAME_TITLE_CHILD,
+ XmNframeChildType, XmFRAME_TITLE_CHILD,
#else
- XmNchildType, XmFRAME_TITLE_CHILD,
+ XmNchildType, XmFRAME_TITLE_CHILD,
#endif
- XmNchildVerticalAlignment,
- XmALIGNMENT_CENTER,
- NULL);
+ XmNchildVerticalAlignment, XmALIGNMENT_CENTER,
+ NULL);
}
Arg args[3];
{
wxString str(wxStripMenuCodes(choices[i]));
m_radioButtonLabels.push_back(str);
- Widget radioItem = XtVaCreateManagedWidget (wxConstCast(str.c_str(), char),
+ Widget radioItem = XtVaCreateManagedWidget (
+ wxConstCast(str.c_str(), char),
#if wxUSE_GADGETS
- xmToggleButtonGadgetClass, radioBoxWidget,
+ xmToggleButtonGadgetClass, radioBoxWidget,
#else
- xmToggleButtonWidgetClass, radioBoxWidget,
+ xmToggleButtonWidgetClass, radioBoxWidget,
#endif
- wxFont::GetFontTag(), fontType,
- NULL);
+ wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
+ NULL);
m_radioButtons.push_back((WXWidget)radioItem);
XtAddCallback (radioItem, XmNvalueChangedCallback,
(XtCallbackProc) wxRadioBoxCallback,
(XtPointer) this);
}
- ChangeFont(FALSE);
+ ChangeFont(false);
SetSelection (0);
-
+
XtRealizeWidget((Widget)m_mainWidget);
XtManageChild (radioBoxWidget);
XtManageChild ((Widget)m_mainWidget);
ChangeBackgroundColour();
- return TRUE;
+ return true;
}
bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
void wxRadioBox::SetString(int item, const wxString& label)
{
- if (item < 0 || item >= m_noItems)
+ if (!IsValid(item))
return;
Widget widget = (Widget) m_radioButtons[item];
- if (label != "")
+ if (!label.empty())
{
wxString label1(wxStripMenuCodes(label));
wxXmString text( label1 );
for (i = 0; i < m_noItems; i++)
if (s == m_radioButtonLabels[i])
return i;
- return -1;
+ return wxNOT_FOUND;
}
void wxRadioBox::SetSelection(int n)
{
- if ((n < 0) || (n >= m_noItems))
+ if (!IsValid(n))
return;
m_selectedButton = n;
- m_inSetValue = TRUE;
+ m_inSetValue = true;
- XmToggleButtonSetState ((Widget) m_radioButtons[n], TRUE, FALSE);
+ XmToggleButtonSetState ((Widget) m_radioButtons[n], True, False);
int i;
for (i = 0; i < m_noItems; i++)
if (i != n)
- XmToggleButtonSetState ((Widget) m_radioButtons[i], FALSE, FALSE);
+ XmToggleButtonSetState ((Widget) m_radioButtons[i], False, False);
- m_inSetValue = FALSE;
+ m_inSetValue = false;
}
// Get single selection, for single choice list items
// Find string for position
wxString wxRadioBox::GetString(int n) const
{
- if ((n < 0) || (n >= m_noItems))
+ if (!IsValid(n))
return wxEmptyString;
return m_radioButtonLabels[n];
}
if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
XtVaSetValues ((Widget) m_mainWidget, XmNx, xx, NULL);
if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- XtVaSetValues ((Widget) m_mainWidget, XmNy, yy, NULL);
+ XtVaSetValues ((Widget) m_mainWidget, XmNy, yy, NULL);
if (width > 0)
XtVaSetValues ((Widget) m_mainWidget, XmNwidth, width, NULL);
}
// Enable a specific button
-void wxRadioBox::Enable(int n, bool enable)
+bool wxRadioBox::Enable(int n, bool enable)
{
- if ((n < 0) || (n >= m_noItems))
- return;
+ if (!IsValid(n))
+ return false;
XtSetSensitive ((Widget) m_radioButtons[n], (Boolean) enable);
+ return true;
}
// Enable all controls
bool wxRadioBox::Enable(bool enable)
{
if ( !wxControl::Enable(enable) )
- return FALSE;
+ return false;
int i;
for (i = 0; i < m_noItems; i++)
XtSetSensitive ((Widget) m_radioButtons[i], (Boolean) enable);
- return TRUE;
+ return true;
}
bool wxRadioBox::Show(bool show)
}
// Show a specific button
-void wxRadioBox::Show(int n, bool show)
+bool wxRadioBox::Show(int n, bool show)
{
// This method isn't complete, and we try do do our best...
// It's main purpose isn't for allowing Show/Unshow dynamically,
// but rather to provide a way to design wxRadioBox such:
//
- // o Val1 o Val2 o Val3
- // o Val4 o Val6
- // o Val7 o Val8 o Val9
+ // o Val1 o Val2 o Val3
+ // o Val4 o Val6
+ // o Val7 o Val8 o Val9
//
// In my case, this is a 'direction' box, and the Show(5,False) is
// coupled with an Enable(5,False)
//
- if ((n < 0) || (n >= m_noItems))
- return;
+ if (!IsValid(n))
+ return false;
XtVaSetValues ((Widget) m_radioButtons[n],
XmNindicatorOn, (unsigned char) show,
// after this call!!
if (!show)
wxRadioBox::SetString (n, " ");
+
+ return true;
}
// For single selection items only
if (sel > -1)
return this->GetString (sel);
else
- return wxString("");
+ return wxEmptyString;
}
bool wxRadioBox::SetStringSelection (const wxString& s)
if (sel > -1)
{
SetSelection (sel);
- return TRUE;
+ return true;
}
else
- return FALSE;
+ return false;
}
void wxRadioBox::Command (wxCommandEvent & event)
{
- SetSelection (event.m_commandInt);
+ SetSelection (event.GetInt());
ProcessCommand (event);
}
{
wxWindow::ChangeFont(keepOriginalSize);
- WXFontType fontType =
- m_font.GetFontType(XtDisplay((Widget) GetTopWidget()));
-
int i;
for (i = 0; i < m_noItems; i++)
{
WXWidget radioButton = m_radioButtons[i];
XtVaSetValues ((Widget) radioButton,
- wxFont::GetFontTag(), fontType,
+ wxFont::GetFontTag(), m_font.GetFontTypeC(XtDisplay((Widget) GetTopWidget())),
NULL);
}
}
{
WXWidget radioButton = m_radioButtons[i];
- wxDoChangeBackgroundColour(radioButton, m_backgroundColour, TRUE);
+ wxDoChangeBackgroundColour(radioButton, m_backgroundColour, true);
XtVaSetValues ((Widget) radioButton,
XmNselectColor, selectPixel,
projects / wxWidgets.git / blobdiff