X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9838df2cefc5b368bb11f98c784ecc78f45ecaf7..31e39e3c51f0a14a49ba86a5326e1461ad60dfee:/src/motif/radiobox.cpp?ds=sidebyside diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp index feb57fe5d4..82baee26db 100644 --- a/src/motif/radiobox.cpp +++ b/src/motif/radiobox.cpp @@ -6,16 +6,25 @@ // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ #pragma implementation "radiobox.h" #endif +#ifdef __VMS +#define XtDisplay XTDISPLAY +#endif + +#include "wx/defs.h" + #include "wx/radiobox.h" #include "wx/utils.h" +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #include #include #include @@ -23,15 +32,16 @@ #include #include #include +#ifdef __VMS__ +#pragma message enable nosimpint +#endif -#include +#include "wx/motif/private.h" void wxRadioBoxCallback (Widget w, XtPointer clientData, - XmToggleButtonCallbackStruct * cbs); + XmToggleButtonCallbackStruct * cbs); -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) -#endif // Radio box item wxRadioBox::wxRadioBox() @@ -63,7 +73,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, m_radioButtonLabels = (wxString*) NULL; m_backgroundColour = parent->GetBackgroundColour(); m_foregroundColour = parent->GetForegroundColour(); - m_windowFont = parent->GetFont(); + m_font = parent->GetFont(); SetName(name); SetValidator(val); @@ -88,70 +98,66 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, wxString label1(wxStripMenuCodes(title)); - XmString text = XmStringCreateSimple ((char*) (const char*) label1); - - Widget formWidget = XtVaCreateManagedWidget ((char*) (const char*) name, - xmFormWidgetClass, parentWidget, - XmNmarginHeight, 0, - XmNmarginWidth, 0, - NULL); + Widget formWidget = XtVaCreateManagedWidget (name.c_str(), + xmFormWidgetClass, parentWidget, + XmNmarginHeight, 0, + XmNmarginWidth, 0, + NULL); m_formWidget = (WXWidget) formWidget; - XmFontList fontList = (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(parentWidget)); + XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget)); if (label1 != "") { - text = XmStringCreateSimple ((char*) (const char*) label1); - Widget labelWidget = XtVaCreateManagedWidget ((char*) (const char*) label1, + wxXmString text(label1); + (void)XtVaCreateManagedWidget(label1.c_str(), #if wxUSE_GADGETS - style & wxCOLOURED ? - xmLabelWidgetClass : xmLabelGadgetClass, - formWidget, + style & wxCOLOURED ? xmLabelWidgetClass + : xmLabelGadgetClass, + formWidget, #else - xmLabelWidgetClass, formWidget, + xmLabelWidgetClass, formWidget, #endif XmNfontList, fontList, - XmNlabelString, text, - NULL); - - XmStringFree (text); + XmNlabelString, text(), + NULL); } Widget frameWidget = XtVaCreateManagedWidget ("frame", - xmFrameWidgetClass, formWidget, + xmFrameWidgetClass, formWidget, XmNshadowType, XmSHADOW_IN, -// XmNmarginHeight, 0, -// XmNmarginWidth, 0, - NULL); +// XmNmarginHeight, 0, +// XmNmarginWidth, 0, + NULL); m_frameWidget = (WXWidget) frameWidget; Arg args[3]; - majorDim = (n + majorDim - 1) / majorDim; + m_majorDim = (n + m_majorDim - 1) / m_majorDim; XtSetArg (args[0], XmNorientation, ((style & wxHORIZONTAL) == wxHORIZONTAL ? - XmHORIZONTAL : XmVERTICAL)); - XtSetArg (args[1], XmNnumColumns, 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 ((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); + XmNtopAttachment, m_labelWidget ? XmATTACH_WIDGET : XmATTACH_FORM, + XmNtopWidget, m_labelWidget ? (Widget) m_labelWidget : formWidget, + XmNbottomAttachment, XmATTACH_FORM, + XmNleftAttachment, XmATTACH_FORM, + XmNrightAttachment, XmATTACH_FORM, + NULL); // if (style & wxFLAT) // XtVaSetValues (radioBoxWidget, XmNborderWidth, 1, NULL); @@ -165,19 +171,18 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, m_radioButtonLabels[i] = str; m_radioButtons[i] = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) str, #if wxUSE_GADGETS - xmToggleButtonGadgetClass, radioBoxWidget, + xmToggleButtonGadgetClass, radioBoxWidget, #else - xmToggleButtonWidgetClass, radioBoxWidget, + xmToggleButtonWidgetClass, radioBoxWidget, #endif XmNfontList, fontList, - NULL); + NULL); XtAddCallback ((Widget) m_radioButtons[i], XmNvalueChangedCallback, (XtCallbackProc) wxRadioBoxCallback, - (XtCallbackProc) this); - + (XtPointer) this); } SetSelection (0); - m_windowFont = parent->GetFont(); + m_font = parent->GetFont(); ChangeFont(FALSE); // XtManageChild((Widget) m_formWidget); @@ -219,8 +224,8 @@ wxString wxRadioBox::GetLabel(int item) const XmString text; char *s; XtVaGetValues (widget, - XmNlabelString, &text, - NULL); + XmNlabelString, &text, + NULL); if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s)) { @@ -248,9 +253,9 @@ void wxRadioBox::SetLabel(int item, const wxString& label) wxString label1(wxStripMenuCodes(label)); XmString text = XmStringCreateSimple ((char*) (const char*) label1); XtVaSetValues (widget, - XmNlabelString, text, - XmNlabelType, XmSTRING, - NULL); + XmNlabelString, text, + XmNlabelType, XmSTRING, + NULL); XmStringFree (text); } } @@ -297,7 +302,7 @@ wxString wxRadioBox::GetString(int n) const return m_radioButtonLabels[n]; } -void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags) +void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) { bool managed = XtIsManaged((Widget) m_formWidget); @@ -309,10 +314,10 @@ void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags) if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) XtVaSetValues ((Widget) m_formWidget, XmNleftAttachment, XmATTACH_SELF, - XmNx, xx, NULL); + XmNx, xx, NULL); if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) XtVaSetValues ((Widget) m_formWidget, XmNtopAttachment, XmATTACH_SELF, - XmNy, yy, NULL); + XmNy, yy, NULL); // Must set the actual RadioBox to be desired size MINUS label size Dimension labelWidth = 0, labelHeight = 0, actualWidth = 0, actualHeight = 0; @@ -345,13 +350,16 @@ void wxRadioBox::Enable(int n, bool enable) } // Enable all controls -void wxRadioBox::Enable(bool enable) +bool wxRadioBox::Enable(bool enable) { - wxControl::Enable(enable); + if ( !wxControl::Enable(enable) ) + return FALSE; int i; for (i = 0; i < m_noItems; i++) XtSetSensitive ((Widget) m_radioButtons[i], (Boolean) enable); + + return TRUE; } bool wxRadioBox::Show(bool show) @@ -421,7 +429,7 @@ void wxRadioBox::ChangeFont(bool keepOriginalSize) { wxWindow::ChangeFont(keepOriginalSize); - XmFontList fontList = (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay((Widget) GetTopWidget())); + XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay((Widget) GetTopWidget())); int i; for (i = 0; i < m_noItems; i++) @@ -430,7 +438,7 @@ void wxRadioBox::ChangeFont(bool keepOriginalSize) XtVaSetValues ((Widget) radioButton, XmNfontList, fontList, - XmNtopAttachment, XmATTACH_FORM, + XmNtopAttachment, XmATTACH_FORM, NULL); } } @@ -470,7 +478,7 @@ void wxRadioBox::ChangeForegroundColour() } void wxRadioBoxCallback (Widget w, XtPointer clientData, - XmToggleButtonCallbackStruct * cbs) + XmToggleButtonCallbackStruct * cbs) { if (!cbs->set) return; @@ -478,7 +486,7 @@ void wxRadioBoxCallback (Widget w, XtPointer clientData, wxRadioBox *item = (wxRadioBox *) clientData; int sel = -1; int i; - for (i = 0; i < item->Number(); i++) + for (i = 0; i < item->GetCount(); i++) if (item->GetRadioButtons() && ((Widget) (item->GetRadioButtons()[i]) == w)) sel = i; item->SetSel(sel);