AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propagate the click dismissing a popup window to the window beneath it

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2002-03-10 22:41:50 +00:00
parent 9b8270da40
commit 326c7ea888
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/common/popupcmn.cpp
View File

@ -267,8 +267,8 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus)
m_focus->PushEventHandler(m_handlerFocus); m_focus->PushEventHandler(m_handlerFocus);
} }
#endif #endif // !__WXX11__
} }
void wxPopupTransientWindow::Dismiss() void wxPopupTransientWindow::Dismiss()
@ -353,19 +353,41 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
{ {
return; return;
} }
wxPoint pos = event.GetPosition(); wxPoint pos = event.GetPosition();
// scrollbar on which the click occured // scrollbar on which the click occured
wxWindow *sbar = NULL; wxWindow *sbar = NULL;
wxWindow *win = (wxWindow *)event.GetEventObject(); wxWindow *win = (wxWindow *)event.GetEventObject();
switch ( win->HitTest(pos.x, pos.y) ) switch ( win->HitTest(pos.x, pos.y) )
{ {
case wxHT_WINDOW_OUTSIDE: case wxHT_WINDOW_OUTSIDE:
// clicking outside a popup dismisses it {
m_popup->DismissAndNotify(); // do the coords translation now as after DismissAndNotify()
// m_popup may be destroyed
wxMouseEvent event2(event);
m_popup->ClientToScreen(&event2.m_x, &event2.m_y);
// clicking outside a popup dismisses it
m_popup->DismissAndNotify();
// dismissing a tooltip shouldn't waste a click, i.e. you
// should be able to dismiss it and press the button with the
// same click, so repost this event to the window beneath us
wxWindow *win = wxFindWindowAtPoint(event2.GetPosition());
if ( win )
{
// translate the event coords to the ones of the window
// which is going to get the event
win->ScreenToClient(&event2.m_x, &event2.m_y);
event2.SetEventObject(win);
wxPostEvent(win, event2);
}
}
break; break;
#ifdef __WXUNIVERSAL__ #ifdef __WXUNIVERSAL__
@ -432,7 +454,7 @@ void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event)
return; return;
win = win->GetParent(); win = win->GetParent();
} }
m_popup->DismissAndNotify(); m_popup->DismissAndNotify();
} }