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

wxBitmapBundle for wxMenuItem on GTK

Browse Source
This commit is contained in:
Alexander Koshelev
2022-02-04 15:00:57 +03:00
parent 337940f009
commit 28d8ed37d6
4 changed files with 60 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/gtk/menu.cpp
View File

@@ -251,6 +251,8 @@ AttachToFrame(wxMenu* menu, wxFrame* frame)
AttachToFrame(menuitem->GetSubMenu(), frame);
node = node->GetNext();
}
menu->SetupBitmaps(frame);
}
} // anonymous namespace
@@ -664,6 +666,8 @@ void wxMenuItem::SetMenuItem(GtkWidget* menuItem)
m_menuItem = menuItem;
if (menuItem)
g_object_ref(menuItem);
if (m_menuItem && m_parentMenu && m_parentMenu->GetWindow())
SetupBitmaps(m_parentMenu->GetWindow());
}
void wxMenuItem::SetItemLabel( const wxString& str )
@@ -752,7 +756,7 @@ void wxMenuItem::ClearExtraAccels()
#endif // wxUSE_ACCEL
void wxMenuItem::SetBitmap(const wxBitmap& bitmap)
void wxMenuItem::SetBitmap(const wxBitmapBundle& bitmap)
{
if (m_kind == wxITEM_NORMAL)
m_bitmap = bitmap;
@@ -762,6 +766,36 @@ void wxMenuItem::SetBitmap(const wxBitmap& bitmap)
}
}
wxBitmap wxMenuItem::GetBitmap() const
{
wxBitmap bmp;
if ( m_bitmap.IsOk() )
{
if ( m_parentMenu && m_parentMenu->GetWindow() )
{
bmp = m_bitmap.GetBitmapFor(m_parentMenu->GetWindow());
}
else
{
bmp = m_bitmap.GetBitmap(wxDefaultSize);
}
}
return bmp;
}
void wxMenuItem::SetupBitmaps(wxWindow *win)
{
#ifndef __WXGTK4__
if ( m_menuItem && m_bitmap.IsOk() )
{
GtkWidget* image = wxGtkImage::New(win);
WX_GTK_IMAGE(image)->Set(m_bitmap);
gtk_widget_show(image);
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(m_menuItem), image);
}
#endif
}
void wxMenuItem::Check( bool check )
{
wxCHECK_RET( m_menuItem, wxT("invalid menu item") );
@@ -1000,14 +1034,9 @@ void wxMenu::GtkAppend(wxMenuItem* mitem, int pos)
menuItem = gtk_menu_item_new_with_label("");
#else
wxGCC_WARNING_SUPPRESS(deprecated-declarations)
const wxBitmap& bitmap = mitem->GetBitmap();
if (bitmap.IsOk())
if (mitem->GetBitmapBundle().IsOk())
{
GtkWidget* image = wxGtkImage::New();
WX_GTK_IMAGE(image)->Set(bitmap);
menuItem = gtk_image_menu_item_new_with_label("");
gtk_widget_show(image);
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuItem), image);
}
else
{
@@ -1110,6 +1139,20 @@ void wxMenu::Attach(wxMenuBarBase *menubar)
SetLayoutDirection(menubar->GetLayoutDirection());
}
void wxMenu::SetupBitmaps(wxWindow *win)
{
wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
while (node)
{
wxMenuItem *menuitem = node->GetData();
if (menuitem->IsSubMenu())
menuitem->GetSubMenu()->SetupBitmaps(win);
if (menuitem->GetKind() == wxITEM_NORMAL)
menuitem->SetupBitmaps(win);
node = node->GetNext();
}
}
// ----------------------------------------------------------------------------
// helpers
// ----------------------------------------------------------------------------