X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d57be459406c2830f6abc9d99ae99166c6d133b..460354e939bc52de1b5a749b6d88d6ef21f5827b:/src/motif/radiobut.cpp diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp index 4fe1489f09..e45879d473 100644 --- a/src/motif/radiobut.cpp +++ b/src/motif/radiobut.cpp @@ -9,139 +9,122 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "radiobut.h" #endif +// 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" -#include -#include +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #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(); - - if (parent) parent->AddChild(this); - - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; - - m_windowStyle = style ; + if( !CreateControl( parent, id, pos, size, style, validator, name ) ) + return false; Widget parentWidget = (Widget) parent->GetClientWidget(); + Display* dpy = XtDisplay(parentWidget); wxString label1(wxStripMenuCodes(label)); - 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; - - Widget labelWidget = XtVaCreateManagedWidget ((char*) (const char*) label1, -#if wxUSE_GADGETS - xmLabelGadgetClass, - formWidget, -#else - xmLabelWidgetClass, formWidget, -#endif - XmNlabelString, text, - NULL); - m_labelWidget = (WXWidget) labelWidget; -/* TODO - if (labelFont) - XtVaSetValues (labelWidget, - XmNfontList, labelFont->GetInternalFont (XtDisplay(formWidget)), - NULL); -*/ - - XmStringFree (text); + wxXmString text( label1 ); Widget radioButtonWidget = XtVaCreateManagedWidget ("toggle", #if wxUSE_GADGETS - xmToggleButtonGadgetClass, formWidget, + xmToggleButtonGadgetClass, parentWidget, #else - xmToggleButtonWidgetClass, formWidget, + xmToggleButtonWidgetClass, parentWidget, #endif - NULL); - XtAddCallback (radioButtonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxRadioButtonCallback, - (XtCallbackProc) this); + wxFont::GetFontTag(), m_font.GetFontTypeC(dpy), + XmNlabelString, text(), + XmNfillOnSelect, True, + XmNindicatorType, XmONE_OF_MANY, // diamond-shape + NULL); - m_mainWidget = (WXWidget) radioButtonWidget; + XtAddCallback (radioButtonWidget, + XmNvalueChangedCallback, + (XtCallbackProc)wxRadioButtonCallback, + (XtPointer)this); -/* 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); + m_mainWidget = (WXWidget) radioButtonWidget; 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()); ChangeBackgroundColour(); - return TRUE; + //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::compatibility_iterator 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) { - m_inSetValue = TRUE; - XmToggleButtonSetState ((Widget) m_mainWidget, (Boolean) value, FALSE); - m_inSetValue = FALSE; + 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 @@ -152,38 +135,104 @@ bool wxRadioButton::GetValue() const void wxRadioButton::Command (wxCommandEvent & event) { - SetValue ( (event.m_commandInt != 0) ); - ProcessCommand (event); + SetValue ( (event.GetInt() != 0) ); + ProcessCommand (event); } -void wxRadioButton::ChangeFont() +void wxRadioButton::ChangeBackgroundColour() { - // TODO + wxWindow::ChangeBackgroundColour(); + + // What colour should this be? + int selectPixel = wxBLACK->AllocColour(XtDisplay((Widget)m_mainWidget)); + + XtVaSetValues ((Widget) GetMainWidget(), + XmNselectColor, selectPixel, + NULL); } -void wxRadioButton::ChangeBackgroundColour() +void wxRadioButtonCallback (Widget w, XtPointer clientData, + XmToggleButtonCallbackStruct * cbs) { - // TODO + 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); } -void wxRadioButton::ChangeForegroundColour() +wxRadioButton* wxRadioButton::AddInCycle(wxRadioButton *cycle) { - // TODO + 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; + } } -void wxRadioButtonCallback (Widget w, XtPointer clientData, - XmToggleButtonCallbackStruct * cbs) +wxRadioButton* wxRadioButton::ClearSelections() { - 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); + 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(); + } +}