/////////////////////////////////////////////////////////////////////////////
-// Name: radiobut.cpp
+// Name: src/motif/radiobut.cpp
// Purpose: wxRadioButton
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "radiobut.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#define XtDisplay XTDISPLAY
#endif
-#include "wx/defs.h"
-
#include "wx/radiobut.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/utils.h"
+#endif
#ifdef __VMS__
#pragma message disable nosimpint
return false;
Widget parentWidget = (Widget) parent->GetClientWidget();
+ Display* dpy = XtDisplay(parentWidget);
wxString label1(wxStripMenuCodes(label));
wxXmString text( label1 );
- WXFontType fontType = m_font.GetFontType(XtDisplay(parentWidget));
-
Widget radioButtonWidget = XtVaCreateManagedWidget ("toggle",
#if wxUSE_GADGETS
xmToggleButtonGadgetClass, parentWidget,
#else
xmToggleButtonWidgetClass, parentWidget,
#endif
- wxFont::GetFontTag(), fontType,
+ wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
XmNlabelString, text(),
XmNfillOnSelect, True,
XmNindicatorType, XmONE_OF_MANY, // diamond-shape
ChangeBackgroundColour();
- //copied from mac/radiobut.cpp (from here till "return TRUE;")
+ //copied from mac/radiobut.cpp (from here till "return true;")
m_cycle = this ;
-
+
if (HasFlag(wxRB_GROUP))
{
AddInCycle( NULL ) ;
}
AddInCycle( chief ) ;
}
- return TRUE;
+ return true;
}
void wxRadioButton::SetValue(bool value)
if (GetValue() == value)
return;
- m_inSetValue = TRUE;
- XmToggleButtonSetState ((Widget) m_mainWidget, (Boolean) value, FALSE);
- m_inSetValue = FALSE;
+ m_inSetValue = true;
+ XmToggleButtonSetState ((Widget) m_mainWidget, (Boolean) value, False);
+ m_inSetValue = false;
ClearSelections();
}
wxWindow::ChangeBackgroundColour();
// What colour should this be?
- int selectPixel = wxBLACK->AllocColour(XtDisplay((Widget)m_mainWidget));
+ wxColour colour = *wxBLACK;
+ int selectPixel = colour.AllocColour(XtDisplay((Widget)m_mainWidget));
XtVaSetValues ((Widget) GetMainWidget(),
XmNselectColor, selectPixel,
NULL);
}
-void wxRadioButtonCallback (Widget w, XtPointer clientData,
+void wxRadioButtonCallback (Widget WXUNUSED(w), XtPointer clientData,
XmToggleButtonCallbackStruct * cbs)
{
if (!cbs->set)
//based on mac/radiobut.cpp
wxRadioButton* old = item->ClearSelections();
- item->SetValue(TRUE);
+ item->SetValue(true);
if ( old )
{
wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED,
old->GetId() );
event.SetEventObject(old);
- event.SetInt( FALSE );
+ event.SetInt( false );
old->ProcessCommand(event);
}
wxCommandEvent event2(wxEVT_COMMAND_RADIOBUTTON_SELECTED, item->GetId() );
event2.SetEventObject(item);
- event2.SetInt( TRUE );
+ event2.SetInt( true );
item->ProcessCommand(event2);
}
wxRadioButton* wxRadioButton::AddInCycle(wxRadioButton *cycle)
{
- wxRadioButton* next;
- wxRadioButton* current;
-
if (cycle == NULL)
{
m_cycle = this;
- return this;
}
else
{
- current = cycle;
- while ((next = current->m_cycle) != cycle)
+ wxRadioButton* current = cycle;
+ while ( current->m_cycle != cycle )
current = current->m_cycle;
m_cycle = cycle;
current->m_cycle = this;
- return cycle;
}
+
+ return cycle;
}
wxRadioButton* wxRadioButton::ClearSelections()
if ( cycle->GetValue() )
{
old = cycle;
- cycle->SetValue(FALSE);
+ cycle->SetValue(false);
}
cycle = cycle->NextInCycle();
}