X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/516cdd54330f3081d6cef74865298a34e7519d84..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/common/popupcmn.cpp diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp index 0a79fdd679..d0f204c4c9 100644 --- a/src/common/popupcmn.cpp +++ b/src/common/popupcmn.cpp @@ -34,6 +34,8 @@ #ifndef WX_PRECOMP #include "wx/combobox.h" // wxComboControl + #include "wx/app.h" // wxPostEvent + #include "wx/log.h" #endif //WX_PRECOMP #ifdef __WXUNIVERSAL__ @@ -89,7 +91,7 @@ public: protected: // event handlers void OnKillFocus(wxFocusEvent& event); - void OnKeyUp(wxKeyEvent& event); + void OnKeyDown(wxKeyEvent& event); private: wxPopupTransientWindow *m_popup; @@ -113,7 +115,7 @@ END_EVENT_TABLE() BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler) EVT_KILL_FOCUS(wxPopupFocusHandler::OnKillFocus) - EVT_KEY_UP(wxPopupFocusHandler::OnKeyUp) + EVT_KEY_DOWN(wxPopupFocusHandler::OnKeyDown) END_EVENT_TABLE() // ============================================================================ @@ -178,6 +180,9 @@ void wxPopupTransientWindow::Init() { m_child = m_focus = (wxWindow *)NULL; + + m_handlerFocus = NULL; + m_handlerPopup = NULL; } wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent, int style) @@ -190,20 +195,35 @@ wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent, int style) wxPopupTransientWindow::~wxPopupTransientWindow() { PopHandlers(); + + delete m_handlerFocus; + delete m_handlerPopup; } void wxPopupTransientWindow::PopHandlers() { if ( m_child ) { - m_child->PopEventHandler(TRUE /* delete it */); + if ( !m_child->RemoveEventHandler(m_handlerPopup) ) + { + // something is very wrong and someone else probably deleted our + // handler - so don't risk deleting it second time + m_handlerPopup = NULL; + } + m_child->ReleaseMouse(); m_child = NULL; } if ( m_focus ) { - m_focus->PopEventHandler(TRUE /* delete it */); +#ifndef __WXX11__ + if ( !m_focus->RemoveEventHandler(m_handlerFocus) ) + { + // see above + m_handlerFocus = NULL; + } +#endif m_focus = NULL; } } @@ -224,26 +244,32 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus) // first Show(); + delete m_handlerPopup; + m_handlerPopup = new wxPopupWindowHandler(this); + m_child->CaptureMouse(); - m_child->PushEventHandler(new wxPopupWindowHandler(this)); + m_child->PushEventHandler(m_handlerPopup); m_focus = winFocus ? winFocus : this; m_focus->SetFocus(); -#ifdef __WXMSW__ - // FIXME: I don't know why does this happen but sometimes SetFocus() simply - // refuses to work under MSW - no error happens but the focus is not - // given to the window, i.e. the assert below is triggered - // - // Try work around this as we can... +#ifndef __WXX11__ - //wxASSERT_MSG( FindFocus() == m_focus, _T("setting focus failed") ); +#ifdef __WXMSW__ + // MSW doesn't allow to set focus to the popup window, but we need to + // subclass the window which has the focus, and not winFocus passed in or + // otherwise everything else breaks down m_focus = FindFocus(); if ( m_focus ) #endif // __WXMSW__ { - m_focus->PushEventHandler(new wxPopupFocusHandler(this)); + delete m_handlerFocus; + m_handlerFocus = new wxPopupFocusHandler(this); + + m_focus->PushEventHandler(m_handlerFocus); } + +#endif // !__WXX11__ } void wxPopupTransientWindow::Dismiss() @@ -335,11 +361,34 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) wxWindow *sbar = NULL; wxWindow *win = (wxWindow *)event.GetEventObject(); + switch ( win->HitTest(pos.x, pos.y) ) { 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; #ifdef __WXUNIVERSAL__ @@ -399,11 +448,18 @@ void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event) // when we lose focus we always disappear - unless it goes to the popup (in // which case we don't really lose it) - if ( event.GetWindow() != m_popup ) - m_popup->DismissAndNotify(); + wxWindow *win = event.GetWindow(); + while ( win ) + { + if ( win == m_popup ) + return; + win = win->GetParent(); + } + + m_popup->DismissAndNotify(); } -void wxPopupFocusHandler::OnKeyUp(wxKeyEvent& event) +void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& event) { // let the window have it first, it might process the keys if ( !m_popup->ProcessEvent(event) )