Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-17 16:40:07 +02:00
Code Issues Releases Wiki Activity

Change some behavior of ShuttleGui::AddBitmapButton...

Browse Source 
... which is not now used, but soon will be
This commit is contained in:
Paul Licameli 2020-01-23 18:33:23 -05:00
parent e8855257cc
commit 358aac3181
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ShuttleGui.cpp
View File

@ -374,7 +374,7 @@ wxBitmapButton * ShuttleGuiBase::AddBitmapButton(
return wxDynamicCast(wxWindow::FindWindowById( miId, mpDlg), wxBitmapButton); return wxDynamicCast(wxWindow::FindWindowById( miId, mpDlg), wxBitmapButton);
wxBitmapButton * pBtn; wxBitmapButton * pBtn;
mpWind = pBtn = safenew wxBitmapButton(GetParent(), miId, Bitmap, mpWind = pBtn = safenew wxBitmapButton(GetParent(), miId, Bitmap,
wxDefaultPosition, wxDefaultSize, GetStyle( wxNO_BORDER ) ); wxDefaultPosition, wxDefaultSize, GetStyle( wxBU_AUTODRAW ) );
pBtn->SetBackgroundColour( pBtn->SetBackgroundColour(
wxColour( 246,246,243)); wxColour( 246,246,243));
// wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)); // wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
@ -2077,8 +2077,13 @@ void ShuttleGuiBase::UpdateSizersCore(bool bPrepend, int Flags, bool prompt)
if ( !mItem.mToolTip.empty() ) if ( !mItem.mToolTip.empty() )
mpWind->SetToolTip( mItem.mToolTip.Translation() ); mpWind->SetToolTip( mItem.mToolTip.Translation() );
if ( !mItem.mName.empty() ) if ( !mItem.mName.empty() ) {
mpWind->SetName( mItem.mName.Stripped().Translation() ); mpWind->SetName( mItem.mName.Stripped().Translation() );
#ifndef __WXMAC__
if (auto pButton = dynamic_cast< wxBitmapButton* >( mpWind ))
pButton->SetLabel( mItem.mName.Translation() );
#endif
}
if ( !mItem.mNameSuffix.empty() ) if ( !mItem.mNameSuffix.empty() )
mpWind->SetName( mpWind->SetName(