mirror of
https://gitlab.com/kicad/code/kicad.git
synced 2025-09-14 02:03:12 +02:00
Use the full bitmap bundles in ACTION_MENU
This commit is contained in:
parent
8f34543569
commit
990caa1988
@ -130,7 +130,7 @@ void ACTION_MENU::DisplayTitle( bool aDisplay )
|
||||
Insert( 0, new wxMenuItem( this, wxID_NONE, m_title, wxEmptyString, wxITEM_NORMAL ) );
|
||||
|
||||
if( !!m_icon )
|
||||
KIUI::AddBitmapToMenuItem( FindItemByPosition( 0 ), KiBitmap( m_icon ) );
|
||||
KIUI::AddBitmapToMenuItem( FindItemByPosition( 0 ), KiBitmapBundle( m_icon ) );
|
||||
|
||||
m_titleDisplayed = true;
|
||||
}
|
||||
@ -145,7 +145,7 @@ wxMenuItem* ACTION_MENU::Add( const wxString& aLabel, int aId, BITMAPS aIcon )
|
||||
wxMenuItem* item = new wxMenuItem( this, aId, aLabel, wxEmptyString, wxITEM_NORMAL );
|
||||
|
||||
if( !!aIcon )
|
||||
KIUI::AddBitmapToMenuItem( item, KiBitmap( aIcon ) );
|
||||
KIUI::AddBitmapToMenuItem( item, KiBitmapBundle( aIcon ) );
|
||||
|
||||
return Append( item );
|
||||
}
|
||||
@ -160,7 +160,7 @@ wxMenuItem* ACTION_MENU::Add( const wxString& aLabel, const wxString& aTooltip,
|
||||
aIsCheckmarkEntry ? wxITEM_CHECK : wxITEM_NORMAL );
|
||||
|
||||
if( !!aIcon )
|
||||
KIUI::AddBitmapToMenuItem( item, KiBitmap( aIcon ) );
|
||||
KIUI::AddBitmapToMenuItem( item, KiBitmapBundle( aIcon ) );
|
||||
|
||||
return Append( item );
|
||||
}
|
||||
@ -179,7 +179,7 @@ wxMenuItem* ACTION_MENU::Add( const TOOL_ACTION& aAction, bool aIsCheckmarkEntry
|
||||
aAction.GetTooltip(),
|
||||
aIsCheckmarkEntry ? wxITEM_CHECK : wxITEM_NORMAL );
|
||||
if( !!icon )
|
||||
KIUI::AddBitmapToMenuItem( item, KiBitmap( icon ) );
|
||||
KIUI::AddBitmapToMenuItem( item, KiBitmapBundle( icon ) );
|
||||
|
||||
m_toolActions[aAction.GetUIId()] = &aAction;
|
||||
|
||||
@ -197,7 +197,7 @@ wxMenuItem* ACTION_MENU::Add( ACTION_MENU* aMenu )
|
||||
if( !!aMenu->m_icon )
|
||||
{
|
||||
wxMenuItem* newItem = new wxMenuItem( this, -1, aMenu->m_title );
|
||||
KIUI::AddBitmapToMenuItem( newItem, KiBitmap( aMenu->m_icon ) );
|
||||
KIUI::AddBitmapToMenuItem( newItem, KiBitmapBundle( aMenu->m_icon ) );
|
||||
newItem->SetSubMenu( aMenu );
|
||||
return Append( newItem );
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user