* In _GSocket_Get_Mac_Socket(), do not call CFSocketSetSocketFlags to turn

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

diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index 0c712b61f9e9072b2dc10689b15e2a327496c448..991c8be68f7d0ea0db3d04e12889f50b016be9c3 100644 (file)
--- a/src/mac/carbon/radiobut.cpp
+++ b/src/mac/carbon/radiobut.cpp
@@ -6,64 +6,92 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR

-// Licence:    wxWindows licence
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "radiobut.h"
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "radiobut.h"
 #endif
 

+#include "wx/defs.h"
+

 #include "wx/radiobut.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 #endif
 
 #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,
 
 bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,

-                  const wxString& label,
+           const wxString& label,

            const wxPoint& pos,
            const wxSize& size, long style,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxPoint& pos,
            const wxSize& size, long style,
            const wxValidator& validator,
            const wxString& name)
 {

-       Rect bounds ;
-       Str255 title ;
-       
-       m_cycle=NULL;
-       
-       MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
-
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1, 
-               kControlRadioButtonProc , (long) this ) ;
-       
-       MacPostControlCreate() ;
-
-  return TRUE;
+    if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
+        return false;
+
+    Rect bounds ;
+    Str255 title ;
+    
+    MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
+
+    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
+          kControlRadioButtonProc , (long) this ) ;
+    
+    MacPostControlCreate() ;
+
+  m_cycle = this ;
+  
+  if (HasFlag(wxRB_GROUP))
+  {
+      AddInCycle( NULL ) ;
+  }
+  else
+  {
+    /* search backward for last group start */
+    wxRadioButton *chief = (wxRadioButton*) NULL;
+    wxWindowList::Node *node = parent->GetChildren().GetLast();
+    while (node)
+    {
+      wxWindow *child = node->GetData();
+      if (child->IsKindOf( CLASSINFO( wxRadioButton ) ) )
+      {
+          chief = (wxRadioButton*) child;
+         if (child->HasFlag(wxRB_GROUP)) break;
+      }
+      node = node->GetPrevious();
+    }
+    AddInCycle( chief ) ;
+  }
+    return TRUE;

 }
 
 void wxRadioButton::SetValue(bool val)
 {
 }
 
 void wxRadioButton::SetValue(bool val)
 {

-       int i;
-       wxRadioButton *cycle;
-       
-   ::SetControlValue( m_macControl , val ) ;
-   
-   if (val) {
-               cycle=this->NextInCycle();
-               if (cycle!=NULL) {
-                       while (cycle!=this) {
-                               cycle->SetValue(false);
-                               cycle=cycle->NextInCycle();
-                               }
-                       }
-               }
+    wxRadioButton *cycle;
+      if ( GetControl32BitValue( (ControlHandle) m_macControl ) == val )
+        return ;
+        
+   ::SetControl32BitValue( (ControlHandle) m_macControl , 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
 {

-    return ::GetControlValue( m_macControl ) ;
+    return ::GetControl32BitValue( (ControlHandle) m_macControl ) ;

 }
 
 void wxRadioButton::Command (wxCommandEvent & event)
 }
 
 void wxRadioButton::Command (wxCommandEvent & event)


@@ -72,25 +100,51 @@ void wxRadioButton::Command (wxCommandEvent & event)
   ProcessCommand (event);
 }
 
   ProcessCommand (event);
 }
 

-void wxRadioButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxRadioButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED(mouseStillDown)) 

 {
 {

-       SetValue(true) ;
+    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)
 {
 }
 
 wxRadioButton *wxRadioButton::AddInCycle(wxRadioButton *cycle)
 {

-       wxRadioButton *next,*current;
-               
-       if (cycle==NULL) {
-               m_cycle=this;
-               return(this);
-               }
-       else {
-               current=cycle;
-               while ((next=current->m_cycle)!=cycle) current=current->m_cycle;
-               m_cycle=cycle;
-               current->m_cycle=this;
-               return(cycle);
-       }
+    wxRadioButton *next,*current;
+        
+    if (cycle==NULL) {
+        m_cycle=this;
+        return(this);
+        }
+    else {
+        current=cycle;
+          while ((next=current->m_cycle)!=cycle) 
+            current=current->m_cycle;
+          m_cycle=cycle;
+          current->m_cycle=this;
+          return(cycle);
+      }

 }  
 }  

-