Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / cocoa / radiobut.h

diff --git a/include/wx/cocoa/radiobut.h b/include/wx/cocoa/radiobut.h
index 4a0be4f61ed084390b88639a094301047f879f2e..9225022b35e7ccfe5249bcf0218237916cc5445d 100644 (file)
--- a/include/wx/cocoa/radiobut.h
+++ b/include/wx/cocoa/radiobut.h
@@ -4,9 +4,9 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/18
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/18

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

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

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_RADIOBUT_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_RADIOBUT_H__


@@ -14,14 +14,14 @@
 
 #include "wx/cocoa/NSButton.h"
 
 
 #include "wx/cocoa/NSButton.h"
 

-class WXDLLEXPORT wxRadioButton;
+class WXDLLIMPEXP_FWD_CORE wxRadioButton;

 
 

-WX_DECLARE_LIST(wxRadioButton, wxRadioButtonList);
+WX_DECLARE_EXPORTED_LIST(wxRadioButton, wxRadioButtonList);

 
 // ========================================================================
 // wxRadioButton
 // ========================================================================
 
 // ========================================================================
 // wxRadioButton
 // ========================================================================

-class WXDLLEXPORT wxRadioButton: public wxControl, protected wxCocoaNSButton
+class WXDLLIMPEXP_CORE wxRadioButton: public wxControl, protected wxCocoaNSButton

 {
     DECLARE_DYNAMIC_CLASS(wxRadioButton)
     DECLARE_EVENT_TABLE()
 {
     DECLARE_DYNAMIC_CLASS(wxRadioButton)
     DECLARE_EVENT_TABLE()


@@ -56,12 +56,16 @@ public:
 // ------------------------------------------------------------------------
 protected:
     virtual void Cocoa_wxNSButtonAction(void);
 // ------------------------------------------------------------------------
 protected:
     virtual void Cocoa_wxNSButtonAction(void);

+private:
+    void Cocoa_DeselectOtherButtonsInTheGroup(void);

 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 public:
     virtual void SetValue(bool);
     virtual bool GetValue() const;
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 public:
     virtual void SetValue(bool);
     virtual bool GetValue() const;

+    virtual void SetLabel(const wxString& label);
+    virtual wxString GetLabel() const;

 protected:
     wxRadioButtonList m_radioSlaves;
     wxRadioButton *m_radioMaster;
 protected:
     wxRadioButtonList m_radioSlaves;
     wxRadioButton *m_radioMaster;