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

Fixed mouse handling for captured windows

Browse Source 
Didn't need most of the cshelp fix


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-05-12 16:08:47 +00:00
parent 5f9ab82db2
commit 449d48f9e1
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/cshelp.cpp
View File

@@ -87,6 +87,9 @@ wxContextHelp::~wxContextHelp()
EndContextHelp(); EndContextHelp();
} }
// Not currently needed, but on some systems capture may not work as
// expected so we'll leave it here for now.
#if 0
static void wxPushOrPopEventHandlers(wxContextHelp* help, wxWindow* win, bool push) static void wxPushOrPopEventHandlers(wxContextHelp* help, wxWindow* win, bool push)
{ {
if (push) if (push)
@@ -103,6 +106,7 @@ static void wxPushOrPopEventHandlers(wxContextHelp* help, wxWindow* win, bool pu
node = node->Next(); node = node->Next();
} }
} }
#endif
// Begin 'context help mode' // Begin 'context help mode'
bool wxContextHelp::BeginContextHelp(wxWindow* win) bool wxContextHelp::BeginContextHelp(wxWindow* win)
@@ -122,8 +126,8 @@ bool wxContextHelp::BeginContextHelp(wxWindow* win)
m_status = FALSE; m_status = FALSE;
// win->PushEventHandler(new wxContextHelpEvtHandler(this)); win->PushEventHandler(new wxContextHelpEvtHandler(this));
wxPushOrPopEventHandlers(this, win, TRUE); //wxPushOrPopEventHandlers(this, win, TRUE);
win->CaptureMouse(); win->CaptureMouse();
@@ -131,8 +135,8 @@ bool wxContextHelp::BeginContextHelp(wxWindow* win)
win->ReleaseMouse(); win->ReleaseMouse();
// win->PopEventHandler(TRUE); win->PopEventHandler(TRUE);
wxPushOrPopEventHandlers(this, win, FALSE); //wxPushOrPopEventHandlers(this, win, FALSE);
win->SetCursor(oldCursor); win->SetCursor(oldCursor);

12
src/msw/window.cpp
View File

@@ -2421,9 +2421,15 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
y = GET_Y_LPARAM(lParam); y = GET_Y_LPARAM(lParam);
// redirect the event to a static control if necessary // redirect the event to a static control if necessary
wxWindow *win = FindWindowForMouseEvent(this, &x, &y); if (this == GetCapture())
{
processed = win->HandleMouseEvent(message, x, y, wParam); processed = HandleMouseEvent(message, x, y, wParam);
}
else
{
wxWindow *win = FindWindowForMouseEvent(this, &x, &y);
processed = win->HandleMouseEvent(message, x, y, wParam);
}
} }
} }
break; break;