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

No changes, just rename OSXSetAcceleratorFromLabel().

Browse Source 
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:
Vadim Zeitlin
2012-11-04 23:50:28 +00:00
parent 04a6d8efe8
commit 5af80d3112
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/osx/button.h
View File

@@ -50,7 +50,7 @@ public:
virtual bool OSXHandleClicked( double timestampsec ); virtual bool OSXHandleClicked( double timestampsec );
#if wxOSX_USE_COCOA #if wxOSX_USE_COCOA
void OSXSetAcceleratorFromLabel(const wxString& label); void OSXUpdateAfterLabelChange(const wxString& label);
#endif #endif
protected: protected:

2
src/osx/button_osx.cpp
View File

@@ -102,7 +102,7 @@ void wxButton::SetLabel(const wxString& label)
wxAnyButton::SetLabel(label); wxAnyButton::SetLabel(label);
#if wxOSX_USE_COCOA #if wxOSX_USE_COCOA
OSXSetAcceleratorFromLabel(label); OSXUpdateAfterLabelChange(label);
#endif #endif
} }

2
src/osx/cocoa/button.mm
View File

@@ -199,7 +199,7 @@ NSButton *wxButtonCocoaImpl::GetNSButton() const
} }
// Set the keyboard accelerator key from the label (e.g. "Click &Me") // 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 // Skip setting the accelerator for the default buttons as this would
// overwrite the default "Enter" which should be preserved. // overwrite the default "Enter" which should be preserved.