From 3a1a045929e86e6d78dfa833ef2e9cb2dd9d7c36 Mon Sep 17 00:00:00 2001
From: David Elliott <dfe@tgwbd.org>
Date: Mon, 6 Aug 2007 14:55:00 +0000
Subject: [PATCH] Merged 44792 (NOTE: CVS) from trunk: implemented GetLabel()
 (part of patch 1679337)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@47907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/cocoa/checkbox.h |  2 ++
 include/wx/cocoa/stattext.h |  6 +++---
 src/cocoa/checkbox.mm       | 10 +++++++++-
 src/cocoa/stattext.mm       |  6 ++++++
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/include/wx/cocoa/checkbox.h b/include/wx/cocoa/checkbox.h
index 2cdaa412c2..93c10cb3fc 100644
--- a/include/wx/cocoa/checkbox.h
+++ b/include/wx/cocoa/checkbox.h
@@ -59,6 +59,8 @@ public:
     virtual void SetValue(bool);
     virtual bool GetValue() const;
     virtual void SetLabel(const wxString& label);
+    virtual wxString GetLabel() const;
+
 protected:
     virtual void DoSet3StateValue(wxCheckBoxState state);
     virtual wxCheckBoxState DoGet3StateValue() const;
diff --git a/include/wx/cocoa/stattext.h b/include/wx/cocoa/stattext.h
index d34bbdac9f..74f8c1ced5 100644
--- a/include/wx/cocoa/stattext.h
+++ b/include/wx/cocoa/stattext.h
@@ -52,8 +52,8 @@ protected:
 // Implementation
 // ------------------------------------------------------------------------
 public:
-    void SetLabel(const wxString& label);
+    virtual void SetLabel(const wxString& label);
+    virtual wxString GetLabel() const;
 };
 
-#endif
-    // __WX_COCOA_STATTEXT_H__
+#endif // __WX_COCOA_STATTEXT_H__
diff --git a/src/cocoa/checkbox.mm b/src/cocoa/checkbox.mm
index 3cfa6be230..ec2915a257 100644
--- a/src/cocoa/checkbox.mm
+++ b/src/cocoa/checkbox.mm
@@ -142,4 +142,12 @@ void wxCheckBox::SetLabel(const wxString& s)
     wxAutoNSAutoreleasePool pool;
     CocoaSetLabelForObject(s, GetNSButton());
 }
-#endif
+
+wxString wxCheckBox::GetLabel() const
+{
+    wxAutoNSAutoreleasePool pool;
+    return wxStringWithNSString([GetNSButton() title]);
+
+}
+
+#endif // wxUSE_CHECKBOX
diff --git a/src/cocoa/stattext.mm b/src/cocoa/stattext.mm
index da5ecd6806..4c948ba801 100644
--- a/src/cocoa/stattext.mm
+++ b/src/cocoa/stattext.mm
@@ -91,6 +91,12 @@ void wxStaticText::SetLabel(const wxString& label)
     [[GetNSTextField() superview] setNeedsDisplayInRect:newFrameRect];
 }
 
+wxString wxStaticText::GetLabel() const
+{
+    wxAutoNSAutoreleasePool pool;
+    return wxStringWithNSString([GetNSTextField() stringValue]);
+}
+
 void wxStaticText::Cocoa_didChangeText(void)
 {
 }