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 bbd0b9595543811b46072b8fb5fec0be7b26b110..9225022b35e7ccfe5249bcf0218237916cc5445d 100644 (file)
--- a/include/wx/cocoa/radiobut.h
+++ b/include/wx/cocoa/radiobut.h
@@ -16,12 +16,12 @@
 
 class WXDLLIMPEXP_FWD_CORE 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;