X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b5f3fe655deeb91d5d3abe8fad30c4a1cae63dc..f4bd67593eae8df6e9a9eb0b7e1374833dbc2a70:/src/motif/radiobut.cpp?ds=inline diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp index 9e2ec2d427..9d77c21388 100644 --- a/src/motif/radiobut.cpp +++ b/src/motif/radiobut.cpp @@ -13,47 +13,58 @@ #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); + XmToggleButtonCallbackStruct * cbs); -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) -#endif wxRadioButton::wxRadioButton() { } bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, long style, - const wxValidator& validator, - const wxString& name) + const wxString& label, + const wxPoint& pos, + const wxSize& size, long style, + const wxValidator& validator, + const wxString& name) { SetName(name); SetValidator(validator); m_backgroundColour = parent->GetBackgroundColour(); m_foregroundColour = parent->GetForegroundColour(); + m_font = parent->GetFont(); if (parent) parent->AddChild(this); if ( id == -1 ) - m_windowId = (int)NewControlId(); + m_windowId = (int)NewControlId(); else - m_windowId = id; + m_windowId = id; m_windowStyle = style ; @@ -63,31 +74,30 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, XmString text = XmStringCreateSimple ((char*) (const char*) label1); + XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget)); Widget radioButtonWidget = XtVaCreateManagedWidget ("toggle", #if wxUSE_GADGETS - xmToggleButtonGadgetClass, parentWidget, + xmToggleButtonGadgetClass, parentWidget, #else - xmToggleButtonWidgetClass, parentWidget, + xmToggleButtonWidgetClass, parentWidget, #endif - XmNlabelString, text, - XmNfillOnSelect, True, - XmNindicatorType, XmONE_OF_MANY, // diamond-shape - NULL); + XmNfontList, fontList, + XmNlabelString, text, + XmNfillOnSelect, True, + XmNindicatorType, XmONE_OF_MANY, // diamond-shape + NULL); XmStringFree (text); XtAddCallback (radioButtonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxRadioButtonCallback, - (XtCallbackProc) this); + (XtPointer) this); m_mainWidget = (WXWidget) radioButtonWidget; - m_windowFont = parent->GetFont(); - ChangeFont(FALSE); - XtManageChild (radioButtonWidget); SetCanAddEventHandler(TRUE); - AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y); + AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y); ChangeBackgroundColour(); @@ -109,8 +119,8 @@ bool wxRadioButton::GetValue() const void wxRadioButton::Command (wxCommandEvent & event) { - SetValue ( (event.m_commandInt != 0) ); - ProcessCommand (event); + SetValue ( (event.m_commandInt != 0) ); + ProcessCommand (event); } void wxRadioButton::ChangeFont(bool keepOriginalSize) @@ -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() @@ -129,18 +146,18 @@ void wxRadioButton::ChangeForegroundColour() } void wxRadioButtonCallback (Widget w, XtPointer clientData, - XmToggleButtonCallbackStruct * cbs) + XmToggleButtonCallbackStruct * cbs) { - if (!cbs->set) - return; + if (!cbs->set) + return; - wxRadioButton *item = (wxRadioButton *) clientData; - if (item->InSetValue()) - return; + wxRadioButton *item = (wxRadioButton *) clientData; + if (item->InSetValue()) + return; - wxCommandEvent event (wxEVT_COMMAND_RADIOBUTTON_SELECTED, item->GetId()); - event.SetEventObject(item); + wxCommandEvent event (wxEVT_COMMAND_RADIOBUTTON_SELECTED, item->GetId()); + event.SetEventObject(item); - item->ProcessCommand (event); + item->ProcessCommand (event); }