From: Vadim Zeitlin Date: Thu, 14 Sep 2006 14:52:43 +0000 (+0000) Subject: don't append trailing tab to items which don't have stock accels X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9b3c30478fc81131e82286699f29c09a78135369?ds=inline don't append trailing tab to items which don't have stock accels git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/stockitem.cpp b/src/common/stockitem.cpp index a559da2155..dadb606182 100644 --- a/src/common/stockitem.cpp +++ b/src/common/stockitem.cpp @@ -171,20 +171,16 @@ wxString wxGetStockLabel(wxWindowID id, long flags) if ( !(flags & wxSTOCK_WITH_MNEMONIC) ) { - stockLabel = wxStripMenuCodes( stockLabel ); + stockLabel = wxStripMenuCodes(stockLabel); } #if wxUSE_ACCEL - - if (!stockLabel.empty() && (flags & wxSTOCK_WITH_ACCELERATOR)) + if ( !stockLabel.empty() && (flags & wxSTOCK_WITH_ACCELERATOR) ) { - stockLabel += _T("\t"); - wxAcceleratorEntry accel = wxGetStockAccelerator(id); if (accel.IsOk()) - stockLabel += accel.ToString(); + stockLabel << _T('\t') << accel.ToString(); } - #endif // wxUSE_ACCEL return stockLabel;