remove xpm files replaced with internal xpm decoder/handler

[wxWidgets.git] / src / mac / radiobut.cpp

diff --git a/src/mac/radiobut.cpp b/src/mac/radiobut.cpp
index c8530a88cd6eb1201b908e8db27f8fa558934670..99d51f705c3ab4edc6e52f8f40c1c52b77811787 100644 (file)
--- a/src/mac/radiobut.cpp
+++ b/src/mac/radiobut.cpp
@@ -32,12 +32,12 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
        
        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() ;
 
                kControlRadioButtonProc , (long) this ) ;
        
        MacPostControlCreate() ;
 

-  m_cycle = NULL ;
+  m_cycle = this ;

   
   if (HasFlag(wxRB_GROUP))
   {
   
   if (HasFlag(wxRB_GROUP))
   {


@@ -67,9 +67,10 @@ void wxRadioButton::SetValue(bool val)
 {
        int i;
        wxRadioButton *cycle;
 {
        int i;
        wxRadioButton *cycle;

-       
+         if ( GetControlValue( m_macControl ) == val )
+           return ;
+           

    ::SetControlValue( m_macControl , val ) ;
    ::SetControlValue( m_macControl , val ) ;

-   

    if (val) 
    {
                cycle=this->NextInCycle();
    if (val) 
    {
                cycle=this->NextInCycle();


@@ -80,6 +81,10 @@ void wxRadioButton::SetValue(bool val)
                                }
                        }
                }
                                }
                        }
                }

+    wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
+    event.SetEventObject(this);
+    event.SetInt( GetValue() );
+    ProcessCommand(event);

 }
 
 bool wxRadioButton::GetValue() const
 }
 
 bool wxRadioButton::GetValue() const


@@ -95,11 +100,7 @@ void wxRadioButton::Command (wxCommandEvent & event)
 
 void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
 {
 
 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);
+         SetValue(true) ;

 }
 
 wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle)
 }
 
 wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle)