Don't call StartingKey if the key was F2

[wxWidgets.git] / src / cocoa / radiobut.mm

diff --git a/src/cocoa/radiobut.mm b/src/cocoa/radiobut.mm
index 2ee422760d1bfba71023f35bd87819b01d2fba7a..2384a73787750df9f8cd6db4c53617e357516159 100644 (file)
--- a/src/cocoa/radiobut.mm
+++ b/src/cocoa/radiobut.mm
@@ -6,17 +6,27 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/03/16
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows license
+// Licence:    wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/app.h"
-#include "wx/radiobut.h"
-#include "wx/log.h"
+#include "wx/wxprec.h"
+
+#if wxUSE_RADIOBTN
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/radiobut.h"
+#endif //WX_PRECOMP

 
 #import <AppKit/NSButton.h>
 #include "wx/cocoa/string.h"
 #include "wx/cocoa/autorelease.h"
 
 
 #import <AppKit/NSButton.h>
 #include "wx/cocoa/string.h"
 #include "wx/cocoa/autorelease.h"
 

+#include "wx/listimpl.cpp"
+
+WX_DEFINE_LIST(wxRadioButtonList);
+

 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 // wxRadioButtonBase == wxControl
 BEGIN_EVENT_TABLE(wxRadioButton, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 // wxRadioButtonBase == wxControl
 BEGIN_EVENT_TABLE(wxRadioButton, wxControl)


@@ -32,13 +42,44 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID winid,
            const wxString& name)
 {
     wxAutoNSAutoreleasePool pool;
            const wxString& name)
 {
     wxAutoNSAutoreleasePool pool;

+    m_radioMaster = NULL;

     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;

+    if(style&wxRB_GROUP)
+    {
+        m_radioMaster = this;
+        m_radioSlaves.Append(this);
+    }
+    else if(style&wxRB_SINGLE)
+        m_radioMaster = NULL;
+    else
+    {
+        for(wxWindowList::compatibility_iterator siblingNode= GetParent()->GetChildren().GetLast();
+            siblingNode;
+            siblingNode = siblingNode->GetPrevious())
+        {
+            wxRadioButton *radioButton  = wxDynamicCast(siblingNode->GetData(),wxRadioButton);
+            if(radioButton && radioButton!=this)
+            {
+                m_radioMaster = radioButton->m_radioMaster;
+                wxASSERT_MSG(m_radioMaster,
+                    wxT("Previous radio button should be part of a group"));
+                // Don't crash, assume user meant wxRB_SINGLE
+                if(m_radioMaster)
+                    m_radioMaster->m_radioSlaves.Append(this);
+                break;
+            }
+        }
+    }
+

     m_cocoaNSView = NULL;
     SetNSButton([[NSButton alloc] initWithFrame: MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
     [GetNSButton() setButtonType: NSRadioButton];
     [GetNSButton() setTitle:wxNSStringWithWxString(label)];
     m_cocoaNSView = NULL;
     SetNSButton([[NSButton alloc] initWithFrame: MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
     [GetNSButton() setButtonType: NSRadioButton];
     [GetNSButton() setTitle:wxNSStringWithWxString(label)];

+    // If it's the first in a group, it should be selected
+    if(style&wxRB_GROUP)
+        [GetNSButton() setState: NSOnState];

     [GetNSControl() sizeToFit];
 
     if(m_parent)
     [GetNSControl() sizeToFit];
 
     if(m_parent)


@@ -50,20 +91,74 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID winid,
 
 wxRadioButton::~wxRadioButton()
 {
 
 wxRadioButton::~wxRadioButton()
 {

-    DisassociateNSButton(m_cocoaNSView);
+    if(m_radioMaster==this)
+    {
+        // First get rid of ourselves (we should ALWAYS be at the head)
+        wxRadioButtonList::compatibility_iterator slaveNode =
+            m_radioSlaves.GetFirst();
+        wxASSERT(slaveNode);
+        wxASSERT(slaveNode->GetData() == this);
+        m_radioSlaves.Erase(slaveNode);
+    
+        // Now find the new master
+        wxRadioButton *newMaster = NULL;
+        slaveNode = m_radioSlaves.GetFirst();
+        if(slaveNode)
+            newMaster = slaveNode->GetData();
+    
+        // For each node (including the new master) set the master, remove
+        // it from this list, and add it to the new master's list
+        for(; slaveNode; slaveNode = m_radioSlaves.GetFirst())
+        {
+            wxRadioButton *radioButton = slaveNode->GetData();
+            wxASSERT(radioButton->m_radioMaster == this);
+            radioButton->m_radioMaster = newMaster;
+            newMaster->m_radioSlaves.Append(radioButton);
+            m_radioSlaves.Erase(slaveNode);
+        }
+    }
+    else if(m_radioMaster)
+    {
+        m_radioMaster->m_radioSlaves.DeleteObject(this);
+        m_radioMaster = NULL;
+    }
+    // normal stuff
+    DisassociateNSButton(GetNSButton());

 }
 
 }
 

-void wxRadioButton::SetValue(bool)
+void wxRadioButton::SetValue(bool value)

 {
 {

+    if(value)
+        [GetNSButton() setState: NSOnState];
+    else
+        [GetNSButton() setState: NSOffState];

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

-    return false;
+    int state = [GetNSButton() state];
+    wxASSERT(state!=NSMixedState);
+    return state==NSOnState;

 }
 
 void wxRadioButton::Cocoa_wxNSButtonAction(void)
 {
 }
 
 void wxRadioButton::Cocoa_wxNSButtonAction(void)
 {

-    wxLogDebug("wxRadioButton");
+    wxLogTrace(wxTRACE_COCOA,wxT("wxRadioButton"));
+    if(m_radioMaster && ([GetNSButton() state] == NSOnState))
+    {
+        for(wxRadioButtonList::compatibility_iterator slaveNode =
+                m_radioMaster->m_radioSlaves.GetFirst();
+            slaveNode; slaveNode = slaveNode->GetNext())
+        {
+            wxRadioButton *radioButton = slaveNode->GetData();
+            if(radioButton!=this)
+                radioButton->SetValue(false);
+        }
+    }
+    wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, GetId());
+    InitCommandEvent(event); //    event.SetEventObject(this);
+    event.SetInt(GetValue());
+    Command(event);

 }
 
 }
 

+#endif