// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "radiobox.h"
#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
#ifdef __VMS
#define XtDisplay XTDISPLAY
#endif
#include "wx/radiobox.h"
#include "wx/utils.h"
+#include "wx/arrstr.h"
#ifdef __VMS__
#pragma message disable nosimpint
#include <Xm/ToggleB.h>
#include <Xm/ToggleBG.h>
#include <Xm/RowColumn.h>
-#include <Xm/Form.h>
#include <Xm/Frame.h>
#ifdef __VMS__
#pragma message enable nosimpint
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,
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)
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(),
+ 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,
+ XmNframeChildType, XmFRAME_TITLE_CHILD,
+#else
+ XmNchildType, XmFRAME_TITLE_CHILD,
#endif
- XmNchildVerticalAlignment, XmALIGNMENT_CENTER,
- NULL);
+ XmNchildVerticalAlignment,
+ XmALIGNMENT_CENTER,
+ NULL);
}
Arg args[3];
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);
XtManageChild (radioBoxWidget);
XtManageChild ((Widget)m_mainWidget);
- SetCanAddEventHandler(TRUE);
AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y);
ChangeBackgroundColour();
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);
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);
}
}
{
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++)
WXWidget radioButton = m_radioButtons[i];
XtVaSetValues ((Widget) radioButton,
- XmNfontList, fontList,
+ wxFont::GetFontTag(), fontType,
NULL);
}
}
{
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,
{
WXWidget radioButton = m_radioButtons[i];
- DoChangeForegroundColour(radioButton, m_foregroundColour);
+ wxDoChangeForegroundColour(radioButton, m_foregroundColour);
}
}
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);
projects / wxWidgets.git / blobdiff