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

Don't use stock items in wxMenu

Browse Source 
Stock items are deprecated since GTK+ 3.10 so corresponding labels
should be used instead of them.
This commit is contained in:
Artur Wieczorek
2017-12-17 00:24:01 +01:00
parent af7b4fa084
commit 5ffae1c936
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gtk/menu.cpp
View File

@@ -895,7 +895,6 @@ void wxMenu::GtkAppend(wxMenuItem* mitem, int pos)
// fall through // fall through
case wxITEM_NORMAL: case wxITEM_NORMAL:
const wxBitmap& bitmap = mitem->GetBitmap(); const wxBitmap& bitmap = mitem->GetBitmap();
const char* stockid;
if (bitmap.IsOk()) if (bitmap.IsOk())
{ {
// always use pixbuf, because pixmap mask does not // always use pixbuf, because pixmap mask does not
@@ -905,12 +904,18 @@ void wxMenu::GtkAppend(wxMenuItem* mitem, int pos)
gtk_widget_show(image); gtk_widget_show(image);
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuItem), image); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuItem), image);
} }
else if ((stockid = wxGetStockGtkID(mitem->GetId())) != NULL) else
{
#if !defined(__WXGTK3__) || !GTK_CHECK_VERSION(3,10,0)
const char* stockid = wxGetStockGtkID(mitem->GetId());
if (stockid)
// use stock bitmap for this item if available on the assumption // use stock bitmap for this item if available on the assumption
// that it never hurts to follow GTK+ conventions more closely // that it never hurts to follow GTK+ conventions more closely
menuItem = gtk_image_menu_item_new_from_stock(stockid, NULL); menuItem = gtk_image_menu_item_new_from_stock(stockid, NULL);
else else
#endif // GTK < 3.10
menuItem = gtk_menu_item_new_with_label(""); menuItem = gtk_menu_item_new_with_label("");
}
break; break;
} }
mitem->SetMenuItem(menuItem); mitem->SetMenuItem(menuItem);
@@ -1274,6 +1279,7 @@ wxGetGtkAccel(const wxMenuItem* item, guint* accel_key, GdkModifierType* accel_m
const wxString string = GetGtkHotKey(*item); const wxString string = GetGtkHotKey(*item);
if (!string.empty()) if (!string.empty())
gtk_accelerator_parse(wxGTK_CONV_SYS(string), accel_key, accel_mods); gtk_accelerator_parse(wxGTK_CONV_SYS(string), accel_key, accel_mods);
#if !defined(__WXGTK3__) || !GTK_CHECK_VERSION(3,10,0)
else else
{ {
GtkStockItem stock_item; GtkStockItem stock_item;
@@ -1284,9 +1290,12 @@ wxGetGtkAccel(const wxMenuItem* item, guint* accel_key, GdkModifierType* accel_m
*accel_mods = stock_item.modifier; *accel_mods = stock_item.modifier;
} }
} }
#endif // GTK < 3.10
} }
#endif // wxUSE_ACCEL #endif // wxUSE_ACCEL
// Stock items are deprecated since GTK+ 3.10
#if !defined(__WXGTK3__) || !GTK_CHECK_VERSION(3,10,0)
const char *wxGetStockGtkID(wxWindowID id) const char *wxGetStockGtkID(wxWindowID id)
{ {
#define STOCKITEM(wx,gtk) \ #define STOCKITEM(wx,gtk) \
@@ -1389,5 +1398,6 @@ const char *wxGetStockGtkID(wxWindowID id)
return NULL; return NULL;
} }
#endif // GTK < 3.10
#endif // wxUSE_MENUS #endif // wxUSE_MENUS