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

Allow overriding the label for stock buttons in wxQt

Browse Source 
Stock label should only be used if passed label is empty. Otherwise,
passed label should override the default value.

Closes https://github.com/wxWidgets/wxWidgets/pull/1086
This commit is contained in:
Jay Nabonne
2018-12-19 08:57:04 +00:00
committed by Vadim Zeitlin
parent ae20edb539
commit c47c7de5ea
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/button.cpp
View File

@@ -45,7 +45,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id,
const wxString& name ) const wxString& name )
{ {
QtCreate(parent); QtCreate(parent);
SetLabel( wxIsStockID( id ) ? wxGetStockLabel( id ) : label ); SetLabel( label.IsEmpty() && wxIsStockID( id ) ? wxGetStockLabel( id ) : label );
return QtCreateControl( parent, id, pos, size, style, validator, name ); return QtCreateControl( parent, id, pos, size, style, validator, name );
} }