m_noRowsOrCols = 0;
m_majorDim = 0 ;
- m_formWidget = (WXWidget) 0;
- m_frameWidget = (WXWidget) 0;
- m_labelWidget = (WXWidget) 0;
m_radioButtons = (WXWidget*) NULL;
m_radioButtonLabels = (wxString*) NULL;
}
{
m_selectedButton = -1;
m_noItems = n;
- m_formWidget = (WXWidget) 0;
- m_frameWidget = (WXWidget) 0;
- m_labelWidget = (WXWidget) 0;
m_radioButtons = (WXWidget*) NULL;
m_radioButtonLabels = (wxString*) NULL;
m_backgroundColour = parent->GetBackgroundColour();
Widget parentWidget = (Widget) parent->GetClientWidget();
- wxString label1(wxStripMenuCodes(title));
-
- Widget formWidget = XtVaCreateManagedWidget (name.c_str(),
- xmFormWidgetClass, parentWidget,
- XmNmarginHeight, 0,
- XmNmarginWidth, 0,
+ m_mainWidget = XtVaCreateWidget ("radioboxframe",
+ xmFrameWidgetClass, parentWidget,
+ XmNshadowType, XmSHADOW_IN,
+ XmNresizeHeight, True,
+ XmNresizeWidth, True,
NULL);
- m_formWidget = (WXWidget) formWidget;
+ wxString label1(wxStripMenuCodes(title));
XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
+
if (label1 != "")
{
wxXmString text(label1);
#if wxUSE_GADGETS
style & wxCOLOURED ? xmLabelWidgetClass
: xmLabelGadgetClass,
- formWidget,
+ (Widget)m_mainWidget,
#else
- xmLabelWidgetClass, formWidget,
+ xmLabelWidgetClass, (Widget)m_mainWidget,
#endif
XmNfontList, fontList,
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,
+#endif
+ XmNchildVerticalAlignment, XmALIGNMENT_CENTER,
NULL);
}
- Widget frameWidget = XtVaCreateManagedWidget ("frame",
- xmFrameWidgetClass, formWidget,
- XmNshadowType, XmSHADOW_IN,
-// XmNmarginHeight, 0,
-// XmNmarginWidth, 0,
- NULL);
-
- m_frameWidget = (WXWidget) frameWidget;
-
Arg args[3];
m_majorDim = (n + m_majorDim - 1) / m_majorDim;
XmHORIZONTAL : XmVERTICAL));
XtSetArg (args[1], XmNnumColumns, m_majorDim);
- Widget radioBoxWidget = XmCreateRadioBox (frameWidget, "radioBoxWidget", args, 2);
- m_mainWidget = (WXWidget) radioBoxWidget;
-
-
- if (m_labelWidget)
- XtVaSetValues ((Widget) m_labelWidget,
- XmNtopAttachment, XmATTACH_FORM,
- XmNleftAttachment, XmATTACH_FORM,
- XmNalignment, XmALIGNMENT_BEGINNING,
- NULL);
-
- XtVaSetValues (radioBoxWidget,
- XmNtopAttachment, m_labelWidget ? XmATTACH_WIDGET : XmATTACH_FORM,
- XmNtopWidget, m_labelWidget ? (Widget) m_labelWidget : formWidget,
- XmNbottomAttachment, XmATTACH_FORM,
- XmNleftAttachment, XmATTACH_FORM,
- XmNrightAttachment, XmATTACH_FORM,
- NULL);
+ Widget radioBoxWidget = XmCreateRadioBox ((Widget)m_mainWidget, "radioBoxWidget", args, 2);
// if (style & wxFLAT)
// XtVaSetValues (radioBoxWidget, XmNborderWidth, 1, NULL);
XtAddCallback ((Widget) m_radioButtons[i], XmNvalueChangedCallback, (XtCallbackProc) wxRadioBoxCallback,
(XtPointer) this);
}
- SetSelection (0);
m_font = parent->GetFont();
ChangeFont(FALSE);
- // XtManageChild((Widget) m_formWidget);
+ SetSelection (0);
+
+ XtRealizeWidget((Widget)m_mainWidget);
XtManageChild (radioBoxWidget);
+ XtManageChild ((Widget)m_mainWidget);
SetCanAddEventHandler(TRUE);
- AttachWidget (parent, m_mainWidget, m_formWidget, pos.x, pos.y, size.x, size.y);
+ AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y);
ChangeBackgroundColour();
delete[] m_radioButtonLabels;
delete[] m_radioButtons;
- DetachWidget(m_formWidget);
DetachWidget(m_mainWidget);
-
- if (m_labelWidget)
- XtDestroyWidget((Widget) m_labelWidget);
XtDestroyWidget((Widget) m_mainWidget);
- XtDestroyWidget((Widget) m_formWidget);
m_mainWidget = (WXWidget) 0;
- m_formWidget = (WXWidget) 0;
- m_labelWidget = (WXWidget) 0;
}
-wxString wxRadioBox::GetLabel(int item) const
-{
- if (item < 0 || item >= m_noItems)
- return wxEmptyString;
-
- Widget widget = (Widget) m_radioButtons[item];
- XmString text;
- char *s;
- XtVaGetValues (widget,
- XmNlabelString, &text,
- NULL);
-
- if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
- {
- // Should we free 'text'???
- XmStringFree(text);
- wxString str(s);
- XtFree (s);
- return str;
- }
- else
- {
- XmStringFree(text);
- return wxEmptyString;
- }
-}
-
-void wxRadioBox::SetLabel(int item, const wxString& label)
+void wxRadioBox::SetString(int item, const wxString& label)
{
if (item < 0 || item >= m_noItems)
return;
void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
- bool managed = XtIsManaged((Widget) m_formWidget);
+ bool managed = XtIsManaged((Widget) m_mainWidget);
if (managed)
- XtUnmanageChild ((Widget) m_formWidget);
+ XtUnmanageChild ((Widget) m_mainWidget);
int xx = x; int yy = y;
AdjustForParentClientOrigin(xx, yy, sizeFlags);
if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- XtVaSetValues ((Widget) m_formWidget, XmNleftAttachment, XmATTACH_SELF,
- XmNx, xx, NULL);
+ XtVaSetValues ((Widget) m_mainWidget, XmNx, xx, NULL);
if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- XtVaSetValues ((Widget) m_formWidget, XmNtopAttachment, XmATTACH_SELF,
- XmNy, yy, NULL);
-
- // Must set the actual RadioBox to be desired size MINUS label size
- Dimension labelWidth = 0, labelHeight = 0, actualWidth = 0, actualHeight = 0;
-
- if (m_labelWidget)
- XtVaGetValues ((Widget) m_labelWidget, XmNwidth, &labelWidth, XmNheight, &labelHeight, NULL);
+ XtVaSetValues ((Widget) m_mainWidget, XmNy, yy, NULL);
- actualWidth = width;
- actualHeight = height - labelHeight;
+ if (width > 0)
+ XtVaSetValues ((Widget) m_mainWidget, XmNwidth, width, NULL);
+ if (height > 0)
+ XtVaSetValues ((Widget) m_mainWidget, XmNheight, height, NULL);
- if (width > -1)
- {
- XtVaSetValues ((Widget) m_mainWidget, XmNwidth, actualWidth, NULL);
- }
- if (height > -1)
- {
- XtVaSetValues ((Widget) m_mainWidget, XmNheight, actualHeight, NULL);
- }
if (managed)
- XtManageChild ((Widget) m_formWidget);
+ XtManageChild ((Widget) m_mainWidget);
}
// Enable a specific button
// Please note that this is all we can do: removing the label
// if switching to unshow state. However, when switching
- // to the on state, it's the prog. resp. to call SetLabel(item,...)
+ // to the on state, it's the prog. resp. to call SetString(item,...)
// after this call!!
if (!show)
- wxRadioBox::SetLabel (n, " ");
+ wxRadioBox::SetString (n, " ");
}
// For single selection items only
XtVaSetValues ((Widget) radioButton,
XmNfontList, fontList,
- XmNtopAttachment, XmATTACH_FORM,
NULL);
}
}
{
wxWindow::ChangeBackgroundColour();
- DoChangeBackgroundColour((Widget) m_frameWidget, m_backgroundColour);
-
int selectPixel = wxBLACK->AllocColour(wxGetDisplay());
int i;
}
}
+static int CalcOtherDim( int items, int dim )
+{
+ return items / dim + ( items % dim ? 1 : 0 );
+}
+
+int wxRadioBox::GetRowCount() const
+{
+ return m_windowStyle & wxRA_SPECIFY_ROWS ? m_noRowsOrCols
+ : CalcOtherDim( GetCount(), m_noRowsOrCols );
+}
+
+int wxRadioBox::GetColumnCount() const
+{
+ return m_windowStyle & wxRA_SPECIFY_COLS ? m_noRowsOrCols
+ : CalcOtherDim( GetCount(), m_noRowsOrCols );
+}
+
void wxRadioBoxCallback (Widget w, XtPointer clientData,
XmToggleButtonCallbackStruct * cbs)
{
return;
wxCommandEvent event (wxEVT_COMMAND_RADIOBOX_SELECTED, item->GetId());
- event.m_commandInt = sel;
+ event.SetInt(sel);
+ event.SetString(item->GetStringSelection());
event.SetEventObject(item);
item->ProcessCommand (event);
}
projects / wxWidgets.git / blobdiff