From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 13 Mar 2007 23:45:47 +0000 (+0000)
Subject: implemented GetLabel() (part of patch 1679337)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d174f457e6a3337d85dbfe1152308cf548e07fa3

implemented GetLabel() (part of patch 1679337)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

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 0e73912c1f..c17d1152fc 100644
--- a/src/cocoa/checkbox.mm
+++ b/src/cocoa/checkbox.mm
@@ -142,4 +142,12 @@ void wxCheckBox::SetLabel(const wxString& s)
     wxAutoNSAutoreleasePool pool;
     [GetNSButton() setTitle:wxNSStringWithWxString(s)];
 }
-#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 4bba022c27..b009c21868 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)
 {
 }