Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged 44792 (NOTE: CVS) from trunk:

Browse Source 
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
This commit is contained in:
David Elliott
2007-08-06 14:55:00 +00:00
parent 9330455ae2
commit 3a1a045929
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/cocoa/checkbox.h
View File

@@ -59,6 +59,8 @@ public:
virtual void SetValue(bool); virtual void SetValue(bool);
virtual bool GetValue() const; virtual bool GetValue() const;
virtual void SetLabel(const wxString& label); virtual void SetLabel(const wxString& label);
virtual wxString GetLabel() const;
protected: protected:
virtual void DoSet3StateValue(wxCheckBoxState state); virtual void DoSet3StateValue(wxCheckBoxState state);
virtual wxCheckBoxState DoGet3StateValue() const; virtual wxCheckBoxState DoGet3StateValue() const;

6
include/wx/cocoa/stattext.h
View File

@@ -52,8 +52,8 @@ protected:
// Implementation // Implementation
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
public: public:
void SetLabel(const wxString& label); virtual void SetLabel(const wxString& label);
virtual wxString GetLabel() const;
}; };
#endif #endif // __WX_COCOA_STATTEXT_H__
// __WX_COCOA_STATTEXT_H__

10
src/cocoa/checkbox.mm
View File

@@ -142,4 +142,12 @@ void wxCheckBox::SetLabel(const wxString& s)
wxAutoNSAutoreleasePool pool; wxAutoNSAutoreleasePool pool;
CocoaSetLabelForObject(s, GetNSButton()); CocoaSetLabelForObject(s, GetNSButton());
} }
#endif
wxString wxCheckBox::GetLabel() const
{
wxAutoNSAutoreleasePool pool;
return wxStringWithNSString([GetNSButton() title]);
}
#endif // wxUSE_CHECKBOX

6
src/cocoa/stattext.mm
View File

@@ -91,6 +91,12 @@ void wxStaticText::SetLabel(const wxString& label)
[[GetNSTextField() superview] setNeedsDisplayInRect:newFrameRect]; [[GetNSTextField() superview] setNeedsDisplayInRect:newFrameRect];
} }
wxString wxStaticText::GetLabel() const
{
wxAutoNSAutoreleasePool pool;
return wxStringWithNSString([GetNSTextField() stringValue]);
}
void wxStaticText::Cocoa_didChangeText(void) void wxStaticText::Cocoa_didChangeText(void)
{ {
} }