// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#include <Xm/ToggleBG.h>
#include <Xm/RowColumn.h>
#include <Xm/Form.h>
+#include <Xm/Frame.h>
#include <wx/motif/private.h>
void wxRadioBoxCallback (Widget w, XtPointer clientData,
- XmToggleButtonCallbackStruct * cbs);
+ XmToggleButtonCallbackStruct * cbs);
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
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();
m_foregroundColour = parent->GetForegroundColour();
- m_windowFont = parent->GetFont();
+ m_font = parent->GetFont();
SetName(name);
SetValidator(val);
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,
+ XmNshadowType, XmSHADOW_IN,
+// 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 (formWidget, "radioBoxWidget", args, 2);
+ 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,
- 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);
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);
+ (XtCallbackProc) this);
}
SetSelection (0);
- m_windowFont = parent->GetFont();
+ m_font = parent->GetFont();
ChangeFont(FALSE);
+ // XtManageChild((Widget) m_formWidget);
XtManageChild (radioBoxWidget);
SetCanAddEventHandler(TRUE);
{
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
XmString text;
char *s;
XtVaGetValues (widget,
- XmNlabelString, &text,
- NULL);
+ XmNlabelString, &text,
+ NULL);
if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
{
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);
}
}
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);
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;
}
// 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)
+{
+ // TODO: show/hide all children
+ return wxControl::Show(show);
}
// Show a specific button
{
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++)
XtVaSetValues ((Widget) radioButton,
XmNfontList, fontList,
- XmNtopAttachment, XmATTACH_FORM,
+ XmNtopAttachment, XmATTACH_FORM,
NULL);
}
}
{
wxWindow::ChangeBackgroundColour();
+ DoChangeBackgroundColour((Widget) m_frameWidget, m_backgroundColour);
+
+ int selectPixel = wxBLACK->AllocColour(wxGetDisplay());
+
int i;
for (i = 0; i < m_noItems; i++)
{
WXWidget radioButton = m_radioButtons[i];
DoChangeBackgroundColour(radioButton, m_backgroundColour, TRUE);
+
+ XtVaSetValues ((Widget) radioButton,
+ XmNselectColor, selectPixel,
+ NULL);
}
}
}
void wxRadioBoxCallback (Widget w, XtPointer clientData,
- XmToggleButtonCallbackStruct * cbs)
+ XmToggleButtonCallbackStruct * cbs)
{
if (!cbs->set)
return;
projects / wxWidgets.git / blobdiff