Worked around problem with kill focus event being sent as soon as

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

diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index 1a31f44a25c95782a9389569d86de5d55905c2d9..a265da4e8ce1133c29340ec4d0bef4c6549bc317 100644 (file)
--- a/src/mac/carbon/radiobut.cpp
+++ b/src/mac/carbon/radiobut.cpp
@@ -9,17 +9,17 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "radiobut.h"
 #endif
 
 #pragma implementation "radiobut.h"
 #endif
 

-#include "wx/defs.h"
+#include "wx/wxprec.h"
+
+#if wxUSE_RADIOBTN

 
 #include "wx/radiobut.h"
 
 
 #include "wx/radiobut.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)

-#endif

 
 #include "wx/mac/uma.h"
 
 
 #include "wx/mac/uma.h"
 


@@ -39,7 +39,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     

-    m_peer = new wxMacControl() ;
+    m_peer = new wxMacControl(this) ;

     verify_noerr ( CreateRadioButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , 
         0 , false /* no autotoggle */ , m_peer->GetControlRefAddr() ) );
     
     verify_noerr ( CreateRadioButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , 
         0 , false /* no autotoggle */ , m_peer->GetControlRefAddr() ) );
     


@@ -75,21 +75,22 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 void wxRadioButton::SetValue(bool val)
 {
     wxRadioButton *cycle;
 void wxRadioButton::SetValue(bool val)
 {
     wxRadioButton *cycle;

-      if ( m_peer->GetValue() == val )
+    if ( m_peer->GetValue() == val )

         return ;
         
         return ;
         

-   m_peer->SetValue( val ) ;
-   if (val) 
-   {
-           cycle=this->NextInCycle();
-          if (cycle!=NULL) {
-               while (cycle!=this) {
-                   cycle->SetValue(false);
-                   cycle=cycle->NextInCycle();
-                   }
-               }
+    m_peer->SetValue( val ) ;
+    if (val) 
+    {
+        cycle=this->NextInCycle();
+        if (cycle!=NULL) 
+        {
+           while (cycle!=this) 
+           {
+               cycle->SetValue(false);
+               cycle=cycle->NextInCycle();

            }
            }

-   MacRedrawControl() ;
+       }
+    }

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


@@ -107,28 +108,21 @@ wxInt32 wxRadioButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVE
 {
     // if already set -> no action
     if ( GetValue() )
 {
     // if already set -> no action
     if ( GetValue() )

-      return noErr;
+        return noErr;

       
       

-      wxRadioButton *cycle, *old = NULL ;
+    wxRadioButton *cycle;

     cycle=this->NextInCycle();
     if (cycle!=NULL) {
     cycle=this->NextInCycle();
     if (cycle!=NULL) {

-          while (cycle!=this) {
+        while (cycle!=this) {

             if ( cycle->GetValue() ) {
             if ( cycle->GetValue() ) {

-              old = cycle ;

                 cycle->SetValue(false);
                 cycle->SetValue(false);

-              }
-              cycle=cycle->NextInCycle();

             }
             }

+            cycle=cycle->NextInCycle();
+        }

     }
 
     }
 

-      SetValue(true) ;
+    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 );
     wxCommandEvent event2(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
     event2.SetEventObject(this);
     event2.SetInt( true );


@@ -153,3 +147,5 @@ wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle)
           return(cycle);
       }
 }  
           return(cycle);
       }
 }  

+
+#endif