added test for m_macControlIsShown in MacRedrawControl apparently HideControl does...

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

diff --git a/src/mac/radiobut.cpp b/src/mac/radiobut.cpp
index 8ce7963ab1aa30a1bbdffee4f319ead5f6c1f2b4..e94c762f1d6ac5c8564b1410efd55713ba10a1d2 100644 (file)
--- a/src/mac/radiobut.cpp
+++ b/src/mac/radiobut.cpp
@@ -13,12 +13,15 @@
 #pragma implementation "radiobut.h"
 #endif
 
-#include "wx/radiobut.h"
+#include "wx/defs.h"
 
+#include "wx/radiobut.h"
 
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
+#endif
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
 
 bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
                   const wxString& label,
@@ -32,7 +35,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+       m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
                kControlRadioButtonProc , (long) this ) ;
        
        MacPostControlCreate() ;
@@ -65,13 +68,11 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 
 void wxRadioButton::SetValue(bool val)
 {
-       int i;
        wxRadioButton *cycle;
-         if ( GetControlValue( m_macControl ) == val )
+         if ( GetControl32BitValue( (ControlHandle) m_macControl ) == val )
            return ;
            
-   ::SetControlValue( m_macControl , val ) ;
-   Refresh() ;
+   ::SetControl32BitValue( (ControlHandle) m_macControl , val ) ;
    if (val) 
    {
                cycle=this->NextInCycle();
@@ -82,11 +83,12 @@ void wxRadioButton::SetValue(bool val)
                                }
                        }
                }
+   MacRedrawControl() ;
 }
 
 bool wxRadioButton::GetValue() const
 {
-    return ::GetControlValue( m_macControl ) ;
+    return ::GetControl32BitValue( (ControlHandle) m_macControl ) ;
 }
 
 void wxRadioButton::Command (wxCommandEvent & event)
@@ -95,13 +97,35 @@ void wxRadioButton::Command (wxCommandEvent & event)
   ProcessCommand (event);
 }
 
-void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxRadioButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
 {
+    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) ;
-    wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
-    event.SetEventObject(this);
-    event.SetInt( GetValue() );
-    ProcessCommand(event);
+
+    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)