MacPreControlCreate( parent , id , label , pos , size ,style, validator , name , &bounds , title ) ;
- m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1,
+ m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1,
kControlRadioButtonProc , (long) this ) ;
MacPostControlCreate() ;
- m_cycle = NULL ;
+ m_cycle = this ;
if (HasFlag(wxRB_GROUP))
{
{
int i;
wxRadioButton *cycle;
-
+ if ( GetControlValue( m_macControl ) == val )
+ return ;
+
::SetControlValue( m_macControl , val ) ;
-
if (val)
{
cycle=this->NextInCycle();
void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart )
{
- SetValue(true) ;
- wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
- event.SetEventObject(this);
- event.SetInt( GetValue() );
- ProcessCommand(event);
+ if ( GetValue() )
+ return ;
+
+ wxRadioButton *cycle, *old = NULL ;
+ cycle=this->NextInCycle();
+ if (cycle!=NULL) {
+ while (cycle!=this) {
+ if ( cycle->GetValue() ) {
+ old = cycle ;
+ cycle->SetValue(false);
+ }
+ cycle=cycle->NextInCycle();
+ }
+ }
+
+ SetValue(true) ;
+
+ if ( old ) {
+ wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, old->m_windowId );
+ event.SetEventObject(old);
+ event.SetInt( false );
+ old->ProcessCommand(event);
+ }
+ wxCommandEvent event2(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
+ event2.SetEventObject(this);
+ event2.SetInt( true );
+ ProcessCommand(event2);
}
wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle)