X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..76e7cfab8fdb0c7862fd07e427af54181717fc62:/src/motif/radiobut.cpp diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp index 5f9674abce..aa1dbd7b5e 100644 --- a/src/motif/radiobut.cpp +++ b/src/motif/radiobut.cpp @@ -1,25 +1,21 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifdef __VMS -#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 @@ -35,8 +31,6 @@ void wxRadioButtonCallback (Widget w, XtPointer clientData, XmToggleButtonCallbackStruct * cbs); -IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) - wxRadioButton::wxRadioButton() { } @@ -50,11 +44,12 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, { if( !CreateControl( parent, id, pos, size, style, validator, name ) ) return false; + PreCreation(); Widget parentWidget = (Widget) parent->GetClientWidget(); Display* dpy = XtDisplay(parentWidget); - wxString label1(wxStripMenuCodes(label)); + wxString label1(GetLabelText(label)); wxXmString text( label1 ); @@ -79,11 +74,10 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, XtManageChild (radioButtonWidget); + PostCreation(); AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y); - ChangeBackgroundColour(); - //copied from mac/radiobut.cpp (from here till "return true;") m_cycle = this ; @@ -94,7 +88,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, else { /* search backward for last group start */ - wxRadioButton *chief = (wxRadioButton*) NULL; + wxRadioButton *chief = NULL; wxWindowList::compatibility_iterator node = parent->GetChildren().GetLast(); while (node) { @@ -140,14 +134,15 @@ void wxRadioButton::ChangeBackgroundColour() wxWindow::ChangeBackgroundColour(); // What colour should this be? - int selectPixel = wxBLACK->AllocColour(XtDisplay((Widget)m_mainWidget)); + wxColour colour = *wxBLACK; + WXPixel 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) @@ -163,13 +158,13 @@ void wxRadioButtonCallback (Widget w, XtPointer clientData, if ( old ) { - wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, + wxCommandEvent event(wxEVT_RADIOBUTTON, old->GetId() ); event.SetEventObject(old); event.SetInt( false ); old->ProcessCommand(event); } - wxCommandEvent event2(wxEVT_COMMAND_RADIOBUTTON_SELECTED, item->GetId() ); + wxCommandEvent event2(wxEVT_RADIOBUTTON, item->GetId() ); event2.SetEventObject(item); event2.SetInt( true ); item->ProcessCommand(event2);