X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ad99bc1398db5a619b3682e90ad7a99485ae4c9..eb65cb341bb04925a8698497e0d2d4a35986f6d4:/src/motif/radiobox.cpp diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp index 8360baf8b4..774c4df47c 100644 --- a/src/motif/radiobox.cpp +++ b/src/motif/radiobox.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "radiobox.h" #endif @@ -21,6 +21,7 @@ #include "wx/radiobox.h" #include "wx/utils.h" +#include "wx/arrstr.h" #ifdef __VMS__ #pragma message disable nosimpint @@ -30,7 +31,6 @@ #include #include #include -#include #include #ifdef __VMS__ #pragma message enable nosimpint @@ -44,15 +44,12 @@ void wxRadioBoxCallback (Widget w, XtPointer clientData, IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) // Radio box item -wxRadioBox::wxRadioBox() +void wxRadioBox::Init() { m_selectedButton = -1; m_noItems = 0; m_noRowsOrCols = 0; m_majorDim = 0 ; - - m_radioButtons = (WXWidget*) NULL; - m_radioButtonLabels = (wxString*) NULL; } bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, @@ -61,26 +58,10 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, int majorDim, long style, const wxValidator& val, const wxString& name) { - m_selectedButton = -1; - m_noItems = n; - m_radioButtons = (WXWidget*) NULL; - m_radioButtonLabels = (wxString*) NULL; - m_backgroundColour = parent->GetBackgroundColour(); - m_foregroundColour = parent->GetForegroundColour(); - m_font = parent->GetFont(); - - SetName(name); - SetValidator(val); - - parent->AddChild(this); - - m_windowStyle = (long&)style; - - if (id == -1) - m_windowId = NewControlId(); - else - m_windowId = id; + if( !CreateControl( parent, id, pos, size, style, val, name ) ) + return false; + m_noItems = n; m_noRowsOrCols = majorDim; if (majorDim==0) @@ -90,33 +71,42 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, Widget parentWidget = (Widget) parent->GetClientWidget(); - m_mainWidget = XtVaCreateWidget ("radiobxoframe", + m_mainWidget = XtVaCreateWidget ("radioboxframe", xmFrameWidgetClass, parentWidget, - XmNshadowType, XmSHADOW_IN, XmNresizeHeight, True, XmNresizeWidth, True, NULL); wxString label1(wxStripMenuCodes(title)); - XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget)); + WXFontType fontType = m_font.GetFontType(XtDisplay(parentWidget)); if (label1 != "") { wxXmString text(label1); - (void)XtVaCreateManagedWidget(label1.c_str(), + 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 - XmNfontList, fontList, - XmNlabelString, text(), - XmNframeChildType, XmFRAME_TITLE_CHILD, - XmNchildVerticalAlignment, XmALIGNMENT_CENTER, - NULL); + wxFont::GetFontTag(), fontType, + 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, +#else + XmNchildType, XmFRAME_TITLE_CHILD, +#endif + XmNchildVerticalAlignment, + XmALIGNMENT_CENTER, + NULL); } Arg args[3]; @@ -126,32 +116,33 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, XtSetArg (args[0], XmNorientation, ((style & wxHORIZONTAL) == wxHORIZONTAL ? XmHORIZONTAL : XmVERTICAL)); XtSetArg (args[1], XmNnumColumns, m_majorDim); + XtSetArg (args[2], XmNadjustLast, False); - Widget radioBoxWidget = XmCreateRadioBox ((Widget)m_mainWidget, "radioBoxWidget", args, 2); + Widget radioBoxWidget = + XmCreateRadioBox ((Widget)m_mainWidget, "radioBoxWidget", args, 3); - // if (style & wxFLAT) - // XtVaSetValues (radioBoxWidget, XmNborderWidth, 1, NULL); + m_radioButtons.reserve(n); + m_radioButtonLabels.reserve(n); - m_radioButtons = new WXWidget[n]; - m_radioButtonLabels = new wxString[n]; int i; for (i = 0; i < n; i++) { wxString str(wxStripMenuCodes(choices[i])); - m_radioButtonLabels[i] = str; - m_radioButtons[i] = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) str, + m_radioButtonLabels.push_back(str); + Widget radioItem = XtVaCreateManagedWidget (wxConstCast(str.c_str(), char), #if wxUSE_GADGETS xmToggleButtonGadgetClass, radioBoxWidget, #else - xmToggleButtonWidgetClass, radioBoxWidget, + xmToggleButtonWidgetClass, radioBoxWidget, #endif - XmNfontList, fontList, + wxFont::GetFontTag(), fontType, NULL); - XtAddCallback ((Widget) m_radioButtons[i], XmNvalueChangedCallback, (XtCallbackProc) wxRadioBoxCallback, - (XtPointer) this); + m_radioButtons.push_back((WXWidget)radioItem); + XtAddCallback (radioItem, XmNvalueChangedCallback, + (XtCallbackProc) wxRadioBoxCallback, + (XtPointer) this); } - m_font = parent->GetFont(); ChangeFont(FALSE); SetSelection (0); @@ -160,7 +151,6 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, XtManageChild (radioBoxWidget); XtManageChild ((Widget)m_mainWidget); - SetCanAddEventHandler(TRUE); AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y); ChangeBackgroundColour(); @@ -168,12 +158,19 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, return TRUE; } +bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, + const wxPoint& pos, const wxSize& size, + const wxArrayString& choices, + int majorDim, long style, + const wxValidator& val, const wxString& name) +{ + wxCArrayString chs(choices); + return Create(parent, id, title, pos, size, chs.GetCount(), + chs.GetStrings(), majorDim, style, val, name); +} wxRadioBox::~wxRadioBox() { - delete[] m_radioButtonLabels; - delete[] m_radioButtons; - DetachWidget(m_mainWidget); XtDestroyWidget((Widget) m_mainWidget); @@ -189,12 +186,12 @@ void wxRadioBox::SetString(int item, const wxString& label) if (label != "") { wxString label1(wxStripMenuCodes(label)); - XmString text = XmStringCreateSimple ((char*) (const char*) label1); + wxXmString text( label1 ); + m_radioButtonLabels[item] = label1; XtVaSetValues (widget, - XmNlabelString, text, + XmNlabelString, text(), XmNlabelType, XmSTRING, NULL); - XmStringFree (text); } } @@ -353,7 +350,8 @@ void wxRadioBox::ChangeFont(bool keepOriginalSize) { wxWindow::ChangeFont(keepOriginalSize); - XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay((Widget) GetTopWidget())); + WXFontType fontType = + m_font.GetFontType(XtDisplay((Widget) GetTopWidget())); int i; for (i = 0; i < m_noItems; i++) @@ -361,7 +359,7 @@ void wxRadioBox::ChangeFont(bool keepOriginalSize) WXWidget radioButton = m_radioButtons[i]; XtVaSetValues ((Widget) radioButton, - XmNfontList, fontList, + wxFont::GetFontTag(), fontType, NULL); } } @@ -370,14 +368,14 @@ void wxRadioBox::ChangeBackgroundColour() { wxWindow::ChangeBackgroundColour(); - int selectPixel = wxBLACK->AllocColour(wxGetDisplay()); + int selectPixel = wxBLACK->AllocColour(XtDisplay((Widget)m_mainWidget)); int i; for (i = 0; i < m_noItems; i++) { WXWidget radioButton = m_radioButtons[i]; - DoChangeBackgroundColour(radioButton, m_backgroundColour, TRUE); + wxDoChangeBackgroundColour(radioButton, m_backgroundColour, TRUE); XtVaSetValues ((Widget) radioButton, XmNselectColor, selectPixel, @@ -394,7 +392,7 @@ void wxRadioBox::ChangeForegroundColour() { WXWidget radioButton = m_radioButtons[i]; - DoChangeForegroundColour(radioButton, m_foregroundColour); + wxDoChangeForegroundColour(radioButton, m_foregroundColour); } } @@ -424,8 +422,9 @@ void wxRadioBoxCallback (Widget w, XtPointer clientData, wxRadioBox *item = (wxRadioBox *) clientData; int sel = -1; int i; + const wxWidgetArray& buttons = item->GetRadioButtons(); for (i = 0; i < item->GetCount(); i++) - if (item->GetRadioButtons() && ((Widget) (item->GetRadioButtons()[i]) == w)) + if (((Widget)buttons[i]) == w) sel = i; item->SetSel(sel);