X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4294b7832a5aed3c1cccc06aecd227d43da8830..7b35aa40a06a160ae4a8650c5820880a020697e3:/src/motif/radiobut.cpp diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp index 29223c6d9a..46906f1a93 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() { - m_labelWidget = (WXWidget) 0; - m_formWidget = (WXWidget) 0; } 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,83 +74,70 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, XmString text = XmStringCreateSimple ((char*) (const char*) label1); - Widget formWidget = XtVaCreateManagedWidget ((char*) (const char*) name, - xmFormWidgetClass, parentWidget, - XmNmarginHeight, 0, - XmNmarginWidth, 0, - NULL); - - m_formWidget = (WXWidget) formWidget; + XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget)); - Widget labelWidget = XtVaCreateManagedWidget ((char*) (const char*) label1, + Widget radioButtonWidget = XtVaCreateManagedWidget ("toggle", #if wxUSE_GADGETS - xmLabelGadgetClass, - formWidget, + xmToggleButtonGadgetClass, parentWidget, #else - xmLabelWidgetClass, formWidget, + xmToggleButtonWidgetClass, parentWidget, #endif - XmNlabelString, text, - NULL); - m_labelWidget = (WXWidget) labelWidget; -/* TODO - if (labelFont) - XtVaSetValues (labelWidget, - XmNfontList, labelFont->GetInternalFont (XtDisplay(formWidget)), - NULL); -*/ - + XmNfontList, fontList, + XmNlabelString, text, + XmNfillOnSelect, True, + XmNindicatorType, XmONE_OF_MANY, // diamond-shape + NULL); XmStringFree (text); - Widget radioButtonWidget = XtVaCreateManagedWidget ("toggle", -#if wxUSE_GADGETS - xmToggleButtonGadgetClass, formWidget, -#else - xmToggleButtonWidgetClass, formWidget, -#endif - NULL); XtAddCallback (radioButtonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxRadioButtonCallback, - (XtCallbackProc) this); + (XtPointer) this); m_mainWidget = (WXWidget) radioButtonWidget; -/* TODO - if (labelFont) - XtVaSetValues (radioButtonWidget, - XmNfontList, labelFont->GetInternalFont (XtDisplay(formWidget)), - NULL); -*/ - - if (labelWidget) - XtVaSetValues (labelWidget, - XmNtopAttachment, XmATTACH_FORM, - XmNleftAttachment, XmATTACH_FORM, - XmNbottomAttachment, XmATTACH_FORM, - XmNalignment, XmALIGNMENT_BEGINNING, - NULL); - XtVaSetValues (radioButtonWidget, - XmNleftOffset, 4, - XmNtopAttachment, XmATTACH_FORM, - XmNbottomAttachment, XmATTACH_FORM, - XmNleftAttachment, (Widget) m_labelWidget ? XmATTACH_WIDGET : XmATTACH_FORM, - XmNleftWidget, (Widget) m_labelWidget ? (Widget) m_labelWidget : formWidget, - NULL); - XtManageChild (radioButtonWidget); SetCanAddEventHandler(TRUE); - AttachWidget (parent, m_mainWidget, m_formWidget, pos.x, pos.y, size.x, size.y); + AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y); - SetFont(* parent->GetFont()); - ChangeColour(m_mainWidget); + ChangeBackgroundColour(); + //copied from mac/radiobut.cpp (from here till "return TRUE;") + m_cycle = this ; + + if (HasFlag(wxRB_GROUP)) + { + AddInCycle( NULL ) ; + } + else + { + /* search backward for last group start */ + wxRadioButton *chief = (wxRadioButton*) NULL; + wxWindowList::Node *node = parent->GetChildren().GetLast(); + while (node) + { + wxWindow *child = node->GetData(); + if (child->IsKindOf( CLASSINFO( wxRadioButton ) ) ) + { + chief = (wxRadioButton*) child; + if (child->HasFlag(wxRB_GROUP)) break; + } + node = node->GetPrevious(); + } + AddInCycle( chief ) ; + } return TRUE; } void wxRadioButton::SetValue(bool value) { + if (GetValue() == value) + return; + m_inSetValue = TRUE; XmToggleButtonSetState ((Widget) m_mainWidget, (Boolean) value, FALSE); m_inSetValue = FALSE; + + ClearSelections(); } // Get single selection, for single choice list items @@ -150,23 +148,114 @@ bool wxRadioButton::GetValue() const void wxRadioButton::Command (wxCommandEvent & event) { - SetValue ( (event.m_commandInt != 0) ); - ProcessCommand (event); + SetValue ( (event.m_commandInt != 0) ); + ProcessCommand (event); } -void wxRadioButtonCallback (Widget w, XtPointer clientData, - XmToggleButtonCallbackStruct * cbs) +void wxRadioButton::ChangeFont(bool keepOriginalSize) { - if (!cbs->set) - return; + wxWindow::ChangeFont(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() +{ + wxWindow::ChangeForegroundColour(); +} - wxRadioButton *item = (wxRadioButton *) clientData; - if (item->InSetValue()) - return; +void wxRadioButtonCallback (Widget w, XtPointer clientData, + XmToggleButtonCallbackStruct * cbs) +{ + if (!cbs->set) + return; + + wxRadioButton *item = (wxRadioButton *) clientData; + if (item->InSetValue()) + return; + + //based on mac/radiobut.cpp + wxRadioButton* old = item->ClearSelections(); + item->SetValue(TRUE); + + if ( old ) + { + wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, + old->GetId() ); + event.SetEventObject(old); + event.SetInt( FALSE ); + old->ProcessCommand(event); + } + wxCommandEvent event2(wxEVT_COMMAND_RADIOBUTTON_SELECTED, item->GetId() ); + event2.SetEventObject(item); + event2.SetInt( TRUE ); + item->ProcessCommand(event2); +} - wxCommandEvent event (wxEVT_COMMAND_RADIOBUTTON_SELECTED, item->GetId()); - event.SetEventObject(item); +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) + current = current->m_cycle; + m_cycle = cycle; + current->m_cycle = this; + return cycle; + } +} - item->ProcessCommand (event); +wxRadioButton* wxRadioButton::ClearSelections() +{ + wxRadioButton* cycle = NextInCycle(); + wxRadioButton* old = 0; + + if (cycle) + { + while (cycle != this) + { + if ( cycle->GetValue() ) + { + old = cycle; + cycle->SetValue(FALSE); + } + cycle = cycle->NextInCycle(); + } + } + + return old; } +void wxRadioButton::RemoveFromCycle() +{ + wxRadioButton* curr = NextInCycle(); + + while( curr ) + { + if( curr->NextInCycle() == this ) + { + curr->m_cycle = this->m_cycle; + return; + } + + curr = curr->NextInCycle(); + } +}