From d745ff0a90bef687e05f0b41a6846992d0e56df0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 5 Feb 2022 20:34:04 +0100 Subject: [PATCH] Remove wxMenuItem::GetBitmapBundle() from wxGTK This function doesn't exist in the other ports and is not really needed in this one neither, so just remove it for now. If we really want to have it, we need to make it available everywhere. --- include/wx/gtk/menuitem.h | 1 - src/gtk/menu.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h index 7edb61e992..dcb7ebc356 100644 --- a/include/wx/gtk/menuitem.h +++ b/include/wx/gtk/menuitem.h @@ -33,7 +33,6 @@ public: virtual bool IsChecked() const wxOVERRIDE; virtual void SetBitmap(const wxBitmapBundle& bitmap); virtual wxBitmap GetBitmap() const; - const wxBitmapBundle& GetBitmapBundle() const { return m_bitmap; } void SetupBitmaps(wxWindow *win); #if wxUSE_ACCEL diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 0611f639d7..9c7439e655 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -1034,7 +1034,7 @@ void wxMenu::GtkAppend(wxMenuItem* mitem, int pos) menuItem = gtk_menu_item_new_with_label(""); #else wxGCC_WARNING_SUPPRESS(deprecated-declarations) - if (mitem->GetBitmapBundle().IsOk()) + if (mitem->GetBitmap().IsOk()) { menuItem = gtk_image_menu_item_new_with_label(""); }