Add wxMenu::MSWDetachHMENU().
Make it possible to pass ownership of a wxMenu to win32. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
3821abef51
commit
2cf91e5c7c
@ -67,6 +67,9 @@ public:
|
||||
// menu handle and will delete it when this object is destroyed.
|
||||
static wxMenu *MSWNewFromHMENU(WXHMENU hMenu) { return new wxMenu(hMenu); }
|
||||
|
||||
// Detaches HMENU so that it isn't deleted when this object is destroyed.
|
||||
// Don't use this object after calling this method.
|
||||
WXHMENU MSWDetachHMENU() { WXHMENU m = m_hMenu; m_hMenu = NULL; return m; }
|
||||
|
||||
// implementation only from now on
|
||||
// -------------------------------
|
||||
|
@ -352,7 +352,7 @@ wxMenu::~wxMenu()
|
||||
// we should free Windows resources only if Windows doesn't do it for us
|
||||
// which happens if we're attached to a menubar or a submenu of another
|
||||
// menu
|
||||
if ( !IsAttached() && !GetParent() )
|
||||
if ( m_hMenu && !IsAttached() && !GetParent() )
|
||||
{
|
||||
if ( !::DestroyMenu(GetHmenu()) )
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user