unset the window as invoking window of wxCurrentPopupMenu (which now exists in all ports and not just wxMSW-based ones) if it being destroyed before the menu itself (modified patch 1837214)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-22 16:29:38 +00:00
parent 66a9201df8
commit eeb0bee1d3
5 changed files with 23 additions and 16 deletions
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -1804,7 +1804,6 @@ bool wxWindowOS2::DoPopupMenu( wxMenu* pMenu, int nX, int nY )
        DoGetSize(0,&nHeight);
        nY = nHeight - nY;
    }
-    wxCurrentPopupMenu = pMenu;

    ::WinPopupMenu( hWndParent
                   ,hWndOwner
@@ -1825,7 +1824,6 @@ bool wxWindowOS2::DoPopupMenu( wxMenu* pMenu, int nX, int nY )
        ::WinDispatchMsg(vHabmain, (PQMSG)&vMsg);
    }

-    wxCurrentPopupMenu = NULL;
    pMenu->SetInvokingWindow(NULL);
    return true;
 } // end of wxWindowOS2::DoPopupMenu