check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/cocoa/radiobut.mm b/src/cocoa/radiobut.mm
index a4d9d46d5e47d987abdb770ed7f9fffb3a0ec03c..f46e4e72a1258dda1866a433e37f3c314dc3d831 100644 (file)
--- a/src/cocoa/radiobut.mm
+++ b/src/cocoa/radiobut.mm
@@ -1,17 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/radiobut.mm
+// Name:        src/cocoa/radiobut.mm

 // Purpose:     wxRadioButton
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
 // Purpose:     wxRadioButton
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

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

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

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

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

-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+#endif //WX_PRECOMP

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


@@ -57,7 +64,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID winid,
             {
                 m_radioMaster = radioButton->m_radioMaster;
                 wxASSERT_MSG(m_radioMaster,
             {
                 m_radioMaster = radioButton->m_radioMaster;
                 wxASSERT_MSG(m_radioMaster,

-                    "Previous radio button should be part of a group");
+                    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);
                 // Don't crash, assume user meant wxRB_SINGLE
                 if(m_radioMaster)
                     m_radioMaster->m_radioSlaves.Append(this);


@@ -70,7 +77,10 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID winid,
     SetNSButton([[NSButton alloc] initWithFrame: MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
     [GetNSButton() setButtonType: NSRadioButton];
     SetNSButton([[NSButton alloc] initWithFrame: MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
     [GetNSButton() setButtonType: NSRadioButton];

-    [GetNSButton() setTitle:wxNSStringWithWxString(label)];
+    CocoaSetLabelForObject(label, GetNSButton());
+    // 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)


@@ -89,14 +99,14 @@ wxRadioButton::~wxRadioButton()
             m_radioSlaves.GetFirst();
         wxASSERT(slaveNode);
         wxASSERT(slaveNode->GetData() == this);
             m_radioSlaves.GetFirst();
         wxASSERT(slaveNode);
         wxASSERT(slaveNode->GetData() == this);

-        m_radioSlaves.DeleteNode(slaveNode);
-    
+        m_radioSlaves.Erase(slaveNode);
+

         // Now find the new master
         wxRadioButton *newMaster = NULL;
         slaveNode = m_radioSlaves.GetFirst();
         if(slaveNode)
             newMaster = slaveNode->GetData();
         // 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())
         // 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())


@@ -105,7 +115,7 @@ wxRadioButton::~wxRadioButton()
             wxASSERT(radioButton->m_radioMaster == this);
             radioButton->m_radioMaster = newMaster;
             newMaster->m_radioSlaves.Append(radioButton);
             wxASSERT(radioButton->m_radioMaster == this);
             radioButton->m_radioMaster = newMaster;
             newMaster->m_radioSlaves.Append(radioButton);

-            m_radioSlaves.DeleteNode(slaveNode);
+            m_radioSlaves.Erase(slaveNode);

         }
     }
     else if(m_radioMaster)
         }
     }
     else if(m_radioMaster)


@@ -114,13 +124,16 @@ wxRadioButton::~wxRadioButton()
         m_radioMaster = NULL;
     }
     // normal stuff
         m_radioMaster = NULL;
     }
     // normal stuff

-    DisassociateNSButton(m_cocoaNSView);
+    DisassociateNSButton(GetNSButton());

 }
 
 void wxRadioButton::SetValue(bool value)
 {
     if(value)
 }
 
 void wxRadioButton::SetValue(bool value)
 {
     if(value)

+    {

         [GetNSButton() setState: NSOnState];
         [GetNSButton() setState: NSOnState];

+        Cocoa_DeselectOtherButtonsInTheGroup();
+    }

     else
         [GetNSButton() setState: NSOffState];
 }
     else
         [GetNSButton() setState: NSOffState];
 }


@@ -132,10 +145,25 @@ bool wxRadioButton::GetValue() const
     return state==NSOnState;
 }
 
     return state==NSOnState;
 }
 

-void wxRadioButton::Cocoa_wxNSButtonAction(void)
+void wxRadioButton::SetLabel(const wxString& label)
+{
+    wxAutoNSAutoreleasePool pool;
+    CocoaSetLabelForObject(label, GetNSButton());
+}
+
+wxString wxRadioButton::GetLabel() const 
+{    
+    return wxStringWithNSString([GetNSButton() title]);
+}
+
+/**
+ * If this radio button is part of a group, this method turns off every other
+ * button in the group.  If this radio button is not part of a group, this
+ * method does absolutely nothing.
+ */
+void wxRadioButton::Cocoa_DeselectOtherButtonsInTheGroup(void)

 {
 {

-    wxLogDebug("wxRadioButton");
-    if(m_radioMaster && ([GetNSButton() state] == NSOnState))
+    if(m_radioMaster)

     {
         for(wxRadioButtonList::compatibility_iterator slaveNode =
                 m_radioMaster->m_radioSlaves.GetFirst();
     {
         for(wxRadioButtonList::compatibility_iterator slaveNode =
                 m_radioMaster->m_radioSlaves.GetFirst();


@@ -146,9 +174,19 @@ void wxRadioButton::Cocoa_wxNSButtonAction(void)
                 radioButton->SetValue(false);
         }
     }
                 radioButton->SetValue(false);
         }
     }

+}
+
+void wxRadioButton::Cocoa_wxNSButtonAction(void)
+{
+    wxLogTrace(wxTRACE_COCOA,wxT("wxRadioButton"));
+    if([GetNSButton() state] == NSOnState)
+    {
+        Cocoa_DeselectOtherButtonsInTheGroup();
+    }

     wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, GetId());
     InitCommandEvent(event); //    event.SetEventObject(this);
     event.SetInt(GetValue());
     Command(event);
 }
 
     wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, GetId());
     InitCommandEvent(event); //    event.SetEventObject(this);
     event.SetInt(GetValue());
     Command(event);
 }
 

+#endif