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

reference count the GtkMenuItem in wxMenuItem as well

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-12-29 07:07:29 +00:00
parent bf487502d9
commit 4011652414
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gtk/menuitem.h
View File

@@ -36,7 +36,7 @@ public:
virtual const wxBitmap& GetBitmap() const { return m_bitmap; } virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
// implementation // implementation
void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; } void SetMenuItem(GtkWidget *menuItem);
GtkWidget *GetMenuItem() const { return m_menuItem; } GtkWidget *GetMenuItem() const { return m_menuItem; }
void SetGtkLabel(); void SetGtkLabel();

11
src/gtk/menu.cpp
View File

@@ -597,9 +597,20 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
wxMenuItem::~wxMenuItem() wxMenuItem::~wxMenuItem()
{ {
if (m_menuItem)
g_object_unref(m_menuItem);
// don't delete menu items, the menus take care of that // don't delete menu items, the menus take care of that
} }
void wxMenuItem::SetMenuItem(GtkWidget* menuItem)
{
if (m_menuItem)
g_object_unref(m_menuItem);
m_menuItem = menuItem;
if (menuItem)
g_object_ref(menuItem);
}
void wxMenuItem::SetItemLabel( const wxString& str ) void wxMenuItem::SetItemLabel( const wxString& str )
{ {
#if wxUSE_ACCEL #if wxUSE_ACCEL