X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d120f8391920145647ec10e84629bc21fa9f1bb..8b3fddc49326c0b6019cd7082218726aa17a5727:/src/motif/radiobut.cpp?ds=sidebyside diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp index cea6c974d0..9d77c21388 100644 --- a/src/motif/radiobut.cpp +++ b/src/motif/radiobut.cpp @@ -13,24 +13,34 @@ #pragma implementation "radiobut.h" #endif +#ifdef __VMS +#define XtDisplay XTDISPLAY +#endif + +#include "wx/defs.h" + #include "wx/radiobut.h" #include "wx/utils.h" +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #include #include #include #include #include #include +#ifdef __VMS__ +#pragma message enable nosimpint +#endif -#include +#include "wx/motif/private.h" void wxRadioButtonCallback (Widget w, XtPointer clientData, XmToggleButtonCallbackStruct * cbs); -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) -#endif wxRadioButton::wxRadioButton() { @@ -47,25 +57,25 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, SetValidator(validator); m_backgroundColour = parent->GetBackgroundColour(); m_foregroundColour = parent->GetForegroundColour(); - m_windowFont = parent->GetFont(); - + m_font = parent->GetFont(); + if (parent) parent->AddChild(this); - + if ( id == -1 ) m_windowId = (int)NewControlId(); else m_windowId = id; - + m_windowStyle = style ; - + Widget parentWidget = (Widget) parent->GetClientWidget(); - + wxString label1(wxStripMenuCodes(label)); - + XmString text = XmStringCreateSimple ((char*) (const char*) label1); - - XmFontList fontList = (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(parentWidget)); - + + XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget)); + Widget radioButtonWidget = XtVaCreateManagedWidget ("toggle", #if wxUSE_GADGETS xmToggleButtonGadgetClass, parentWidget, @@ -78,19 +88,19 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, XmNindicatorType, XmONE_OF_MANY, // diamond-shape NULL); XmStringFree (text); - + XtAddCallback (radioButtonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxRadioButtonCallback, - (XtCallbackProc) this); - + (XtPointer) this); + m_mainWidget = (WXWidget) radioButtonWidget; - + XtManageChild (radioButtonWidget); - + SetCanAddEventHandler(TRUE); AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y); - + ChangeBackgroundColour(); - + return TRUE; } @@ -121,6 +131,13 @@ void wxRadioButton::ChangeFont(bool keepOriginalSize) void wxRadioButton::ChangeBackgroundColour() { wxWindow::ChangeBackgroundColour(); + + // What colour should this be? + int selectPixel = wxBLACK->AllocColour(wxGetDisplay()); + + XtVaSetValues ((Widget) GetMainWidget(), + XmNselectColor, selectPixel, + NULL); } void wxRadioButton::ChangeForegroundColour() @@ -133,14 +150,14 @@ void wxRadioButtonCallback (Widget w, XtPointer clientData, { if (!cbs->set) return; - + wxRadioButton *item = (wxRadioButton *) clientData; if (item->InSetValue()) return; - + wxCommandEvent event (wxEVT_COMMAND_RADIOBUTTON_SELECTED, item->GetId()); event.SetEventObject(item); - + item->ProcessCommand (event); }