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

Enabling the Pop Menu fix to peek at all the command messages. Required adding a secondary DoMessage to wxApp. Some textctrl work as well.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-06-08 15:24:37 +00:00
parent 153b1416a4
commit 3febf6845f
5 changed files with 56 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/os2/window.cpp
View File

@@ -1810,6 +1810,26 @@ void wxWindow::GetCaretPos(
// popup menu
// ---------------------------------------------------------------------------
static void wxYieldForCommandsOnly()
{
//
// Peek all WM_COMMANDs (it will always return WM_QUIT too but we don't
// want to process it here)
//
QMSG vMsg;
while (::WinPeekMsg( vHabmain
,&vMsg
,(HWND)0
,WM_COMMAND
,WM_COMMAND
,PM_REMOVE
) && vMsg.msg != WM_QUIT)
{
wxTheApp->DoMessage((WXMSG*)&vMsg);
}
}
bool wxWindow::DoPopupMenu(
wxMenu* pMenu
, int nX
@@ -1836,7 +1856,14 @@ bool wxWindow::DoPopupMenu(
,0L
,PU_MOUSEBUTTON2DOWN | PU_MOUSEBUTTON2 | PU_KEYBOARD
);
wxYield();
// we need to do it righ now as otherwise the events are never going to be
// sent to wxCurrentPopupMenu from HandleCommand()
//
// note that even eliminating (ugly) wxCurrentPopupMenu global wouldn't
// help and we'd still need wxYieldForCommandsOnly() as the menu may be
// destroyed as soon as we return (it can be a local variable in the caller
// for example) and so we do need to process the event immediately
wxYieldForCommandsOnly();
wxCurrentPopupMenu = NULL;
pMenu->SetInvokingWindow(NULL);