/////////////////////////////////////////////////////////////////////////////
-// Name: radiobox.cpp
+// Name: src/motif/radiobox.cpp
// Purpose: wxRadioBox
// Author: Julian Smart
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "radiobox.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
+#if wxUSE_RADIOBOX
+
#ifdef __VMS
#define XtDisplay XTDISPLAY
#endif
-#include "wx/defs.h"
-
#include "wx/radiobox.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/utils.h"
+#endif
+
#include "wx/arrstr.h"
#ifdef __VMS__
m_selectedButton = -1;
m_noItems = 0;
m_noRowsOrCols = 0;
- m_majorDim = 0 ;
}
bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
if( !CreateControl( parent, id, pos, size, style, val, name ) )
return false;
- m_noItems = n;
+ m_noItems = (unsigned int)n;
m_noRowsOrCols = majorDim;
- if (majorDim==0)
- m_majorDim = n ;
- else
- m_majorDim = majorDim ;
+ SetMajorDim(majorDim == 0 ? n : majorDim, style);
Widget parentWidget = (Widget) parent->GetClientWidget();
+ Display* dpy = XtDisplay(parentWidget);
m_mainWidget = XtVaCreateWidget ("radioboxframe",
- xmFrameWidgetClass, parentWidget,
- XmNresizeHeight, True,
- XmNresizeWidth, True,
- NULL);
+ xmFrameWidgetClass, parentWidget,
+ XmNresizeHeight, True,
+ XmNresizeWidth, True,
+ NULL);
wxString label1(wxStripMenuCodes(title));
- WXFontType fontType = m_font.GetFontType(XtDisplay(parentWidget));
-
if (!label1.empty())
{
wxXmString text(label1);
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
- wxFont::GetFontTag(), fontType,
- XmNlabelString, text(),
+ wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
+ 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,
+ XmNchildType, XmFRAME_TITLE_CHILD,
#endif
- XmNchildVerticalAlignment,
- XmALIGNMENT_CENTER,
- NULL);
+ XmNchildVerticalAlignment, XmALIGNMENT_CENTER,
+ NULL);
}
Arg args[3];
- m_majorDim = (n + m_majorDim - 1) / m_majorDim;
-
XtSetArg (args[0], XmNorientation, ((style & wxHORIZONTAL) == wxHORIZONTAL ?
XmHORIZONTAL : XmVERTICAL));
- XtSetArg (args[1], XmNnumColumns, m_majorDim);
+ XtSetArg (args[1], XmNnumColumns, GetMajorDim());
XtSetArg (args[2], XmNadjustLast, False);
Widget radioBoxWidget =
- XmCreateRadioBox ((Widget)m_mainWidget, "radioBoxWidget", args, 3);
+ XmCreateRadioBox ((Widget)m_mainWidget, wxMOTIF_STR("radioBoxWidget"), args, 3);
m_radioButtons.reserve(n);
m_radioButtonLabels.reserve(n);
{
wxString str(wxStripMenuCodes(choices[i]));
m_radioButtonLabels.push_back(str);
- Widget radioItem = XtVaCreateManagedWidget (wxConstCast(str.c_str(), char),
+ Widget radioItem = XtVaCreateManagedWidget (
+ wxConstCast(str.c_str(), char),
#if wxUSE_GADGETS
- xmToggleButtonGadgetClass, radioBoxWidget,
+ xmToggleButtonGadgetClass, radioBoxWidget,
#else
- xmToggleButtonWidgetClass, radioBoxWidget,
+ xmToggleButtonWidgetClass, radioBoxWidget,
#endif
- wxFont::GetFontTag(), fontType,
- NULL);
+ wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
+ NULL);
m_radioButtons.push_back((WXWidget)radioItem);
XtAddCallback (radioItem, XmNvalueChangedCallback,
(XtCallbackProc) wxRadioBoxCallback,
m_mainWidget = (WXWidget) 0;
}
-void wxRadioBox::SetString(int item, const wxString& label)
+void wxRadioBox::SetString(unsigned int item, const wxString& label)
{
if (!IsValid(item))
return;
- Widget widget = (Widget) m_radioButtons[item];
+ Widget widget = (Widget)m_radioButtons[item];
if (!label.empty())
{
wxString label1(wxStripMenuCodes(label));
}
}
-int wxRadioBox::FindString(const wxString& s) const
-{
- int i;
- for (i = 0; i < m_noItems; i++)
- if (s == m_radioButtonLabels[i])
- return i;
- return wxNOT_FOUND;
-}
-
void wxRadioBox::SetSelection(int n)
{
if (!IsValid(n))
XmToggleButtonSetState ((Widget) m_radioButtons[n], True, False);
- int i;
- for (i = 0; i < m_noItems; i++)
- if (i != n)
+ for (unsigned int i = 0; i < m_noItems; i++)
+ if (i != (unsigned int)n)
XmToggleButtonSetState ((Widget) m_radioButtons[i], False, False);
m_inSetValue = false;
}
// Find string for position
-wxString wxRadioBox::GetString(int n) const
+wxString wxRadioBox::GetString(unsigned int n) const
{
if (!IsValid(n))
return wxEmptyString;
}
// Enable a specific button
-bool wxRadioBox::Enable(int n, bool enable)
+bool wxRadioBox::Enable(unsigned int n, bool enable)
{
if (!IsValid(n))
return false;
if ( !wxControl::Enable(enable) )
return false;
- int i;
- for (i = 0; i < m_noItems; i++)
+ for (unsigned int i = 0; i < m_noItems; i++)
XtSetSensitive ((Widget) m_radioButtons[i], (Boolean) enable);
return true;
}
// Show a specific button
-bool wxRadioBox::Show(int n, bool show)
+bool wxRadioBox::Show(unsigned int n, bool show)
{
// This method isn't complete, and we try do do our best...
// It's main purpose isn't for allowing Show/Unshow dynamically,
wxString wxRadioBox::GetStringSelection () const
{
int sel = GetSelection ();
- if (sel > -1)
- return this->GetString (sel);
+ if (sel != wxNOT_FOUND)
+ return this->GetString((unsigned int)sel);
else
return wxEmptyString;
}
{
wxWindow::ChangeFont(keepOriginalSize);
- WXFontType fontType =
- m_font.GetFontType(XtDisplay((Widget) GetTopWidget()));
-
- int i;
- for (i = 0; i < m_noItems; i++)
+ for (unsigned int i = 0; i < m_noItems; i++)
{
WXWidget radioButton = m_radioButtons[i];
XtVaSetValues ((Widget) radioButton,
- wxFont::GetFontTag(), fontType,
+ wxFont::GetFontTag(), m_font.GetFontTypeC(XtDisplay((Widget) GetTopWidget())),
NULL);
}
}
{
wxWindow::ChangeBackgroundColour();
- int selectPixel = wxBLACK->AllocColour(XtDisplay((Widget)m_mainWidget));
+ wxColour colour = *wxBLACK;
+ int selectPixel = colour.AllocColour(XtDisplay((Widget)m_mainWidget));
- int i;
- for (i = 0; i < m_noItems; i++)
+ for (unsigned int i = 0; i < m_noItems; i++)
{
WXWidget radioButton = m_radioButtons[i];
{
wxWindow::ChangeForegroundColour();
- int i;
- for (i = 0; i < m_noItems; i++)
+ for (unsigned int i = 0; i < m_noItems; i++)
{
WXWidget radioButton = m_radioButtons[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)
{
wxRadioBox *item = (wxRadioBox *) clientData;
int sel = -1;
- int i;
+ unsigned int i;
const wxWidgetArray& buttons = item->GetRadioButtons();
for (i = 0; i < item->GetCount(); i++)
if (((Widget)buttons[i]) == w)
- sel = i;
+ sel = (int)i;
item->SetSel(sel);
if (item->InSetValue())
item->ProcessCommand (event);
}
+#endif // wxUSE_RADIOBOX
projects / wxWidgets.git / blobdiff