added generic color dialog to setup

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

diff --git a/src/mac/radiobut.cpp b/src/mac/radiobut.cpp
index 8ce7963ab1aa30a1bbdffee4f319ead5f6c1f2b4..8fd9b91adf5e82680212c86d5fdcde816269e585 100644 (file)
--- a/src/mac/radiobut.cpp
+++ b/src/mac/radiobut.cpp
@@ -13,10 +13,13 @@
 #pragma implementation "radiobut.h"
 #endif
 
 #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)
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)

+#endif

 
 #include <wx/mac/uma.h>
 
 
 #include <wx/mac/uma.h>
 


@@ -71,7 +74,6 @@ void wxRadioButton::SetValue(bool val)
            return ;
            
    ::SetControlValue( m_macControl , val ) ;
            return ;
            
    ::SetControlValue( m_macControl , val ) ;

-   Refresh() ;

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


@@ -97,11 +99,33 @@ void wxRadioButton::Command (wxCommandEvent & event)
 
 void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
 {
 
 void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 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) ;
          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)
 }
 
 wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle)