No changes, just rename OSXSetAcceleratorFromLabel().
Make the name of the function more general and call it OSXUpdateAfterLabelChange() as it's supposed to be called whenever the label changes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
04a6d8efe8
commit
5af80d3112
@ -50,7 +50,7 @@ public:
|
||||
virtual bool OSXHandleClicked( double timestampsec );
|
||||
|
||||
#if wxOSX_USE_COCOA
|
||||
void OSXSetAcceleratorFromLabel(const wxString& label);
|
||||
void OSXUpdateAfterLabelChange(const wxString& label);
|
||||
#endif
|
||||
|
||||
protected:
|
||||
|
@ -102,7 +102,7 @@ void wxButton::SetLabel(const wxString& label)
|
||||
|
||||
wxAnyButton::SetLabel(label);
|
||||
#if wxOSX_USE_COCOA
|
||||
OSXSetAcceleratorFromLabel(label);
|
||||
OSXUpdateAfterLabelChange(label);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -199,7 +199,7 @@ NSButton *wxButtonCocoaImpl::GetNSButton() const
|
||||
}
|
||||
|
||||
// Set the keyboard accelerator key from the label (e.g. "Click &Me")
|
||||
void wxButton::OSXSetAcceleratorFromLabel(const wxString& label)
|
||||
void wxButton::OSXUpdateAfterLabelChange(const wxString& label)
|
||||
{
|
||||
// Skip setting the accelerator for the default buttons as this would
|
||||
// overwrite the default "Enter" which should be preserved.
|
||||
|
Loading…
Reference in New Issue
Block a user