X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45f22d48cdd5f8cc57b9ddc6f48c7c953adbb940..2e7b0a1617dbdada26531371627a1cd8a72e9149:/src/common/popupcmn.cpp diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp index b0309296cc..d0f204c4c9 100644 --- a/src/common/popupcmn.cpp +++ b/src/common/popupcmn.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "popupwin.h" + #pragma implementation "popupwinbase.h" #endif // For compilers that support precompilation, includes "wx.h". @@ -34,12 +34,26 @@ #ifndef WX_PRECOMP #include "wx/combobox.h" // wxComboControl + #include "wx/app.h" // wxPostEvent + #include "wx/log.h" #endif //WX_PRECOMP #ifdef __WXUNIVERSAL__ #include "wx/univ/renderer.h" #endif // __WXUNIVERSAL__ +// there is no src/{msw,mgl}/popupwin.cpp to put this in, so we do it here - BTW we +// probably could do it for all ports here just as well +#if defined(__WXMSW__) || defined(__WXMGL__) + IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow) +#endif // __WXMSW__ + +IMPLEMENT_DYNAMIC_CLASS(wxPopupTransientWindow, wxPopupWindow) + +#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) + IMPLEMENT_DYNAMIC_CLASS(wxPopupComboWindow, wxPopupTransientWindow) +#endif + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -64,15 +78,30 @@ private: class wxPopupFocusHandler : public wxEvtHandler { public: - wxPopupFocusHandler(wxPopupTransientWindow *popup) { m_popup = popup; } + wxPopupFocusHandler(wxPopupTransientWindow *popup) + { + m_popup = popup; + +#ifdef __WXGTK__ + // ignore the next few OnKillFocus() calls + m_creationTime = time(NULL); +#endif // __WXGTK__ + } protected: // event handlers void OnKillFocus(wxFocusEvent& event); + void OnKeyDown(wxKeyEvent& event); private: wxPopupTransientWindow *m_popup; + // hack around wxGTK bug: we always get several kill focus events + // immediately after creation! +#ifdef __WXGTK__ + time_t m_creationTime; +#endif // __WXGTK__ + DECLARE_EVENT_TABLE() }; @@ -86,6 +115,7 @@ END_EVENT_TABLE() BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler) EVT_KILL_FOCUS(wxPopupFocusHandler::OnKillFocus) + EVT_KEY_DOWN(wxPopupFocusHandler::OnKeyDown) END_EVENT_TABLE() // ============================================================================ @@ -96,6 +126,11 @@ END_EVENT_TABLE() // wxPopupWindowBase // ---------------------------------------------------------------------------- +wxPopupWindowBase::~wxPopupWindowBase() +{ + // this destructor is required for Darwin +} + bool wxPopupWindowBase::Create(wxWindow* WXUNUSED(parent), int WXUNUSED(flags)) { return TRUE; @@ -145,32 +180,50 @@ void wxPopupTransientWindow::Init() { m_child = m_focus = (wxWindow *)NULL; + + m_handlerFocus = NULL; + m_handlerPopup = NULL; } -wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent) +wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent, int style) { Init(); - (void)Create(parent); + (void)Create(parent, 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; } } @@ -187,14 +240,36 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus) m_child = this; } - m_child->CaptureMouse(); - m_child->PushEventHandler(new wxPopupWindowHandler(this)); - + // we can't capture mouse before the window is shown in wxGTK, so do it + // first Show(); + delete m_handlerPopup; + m_handlerPopup = new wxPopupWindowHandler(this); + + m_child->CaptureMouse(); + m_child->PushEventHandler(m_handlerPopup); + m_focus = winFocus ? winFocus : this; - m_focus->PushEventHandler(new wxPopupFocusHandler(this)); m_focus->SetFocus(); + +#ifndef __WXX11__ + +#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__ + { + delete m_handlerFocus; + m_handlerFocus = new wxPopupFocusHandler(this); + + m_focus->PushEventHandler(m_handlerFocus); + } + +#endif // !__WXX11__ } void wxPopupTransientWindow::Dismiss() @@ -222,7 +297,7 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event)) return FALSE; } -#if wxUSE_COMBOBOX +#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) // ---------------------------------------------------------------------------- // wxPopupComboWindow @@ -246,7 +321,7 @@ void wxPopupComboWindow::PositionNearCombo() // the origin point must be in screen coords wxPoint ptOrigin = m_combo->ClientToScreen(wxPoint(0, 0)); -#ifdef __WXUNIVERSAL__ +#if 0 //def __WXUNIVERSAL__ // account for the fact that (0, 0) is not the top left corner of the // window: there is also the border wxRect rectBorders = m_combo->GetRenderer()-> @@ -265,7 +340,7 @@ void wxPopupComboWindow::OnDismiss() m_combo->OnDismiss(); } -#endif // wxUSE_COMBOBOX +#endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) // ---------------------------------------------------------------------------- // wxPopupWindowHandler @@ -286,13 +361,37 @@ 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__ case wxHT_WINDOW_HORZ_SCROLLBAR: sbar = win->GetScrollbar(wxHORIZONTAL); break; @@ -300,6 +399,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) case wxHT_WINDOW_VERT_SCROLLBAR: sbar = win->GetScrollbar(wxVERTICAL); break; +#endif default: // forgot to update the switch after adding a new hit test code? @@ -336,12 +436,38 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event) { - // when we lose focus we always disappear +#ifdef __WXGTK__ + // ignore the next OnKillFocus() call + if ( time(NULL) < m_creationTime + 1 ) + { + event.Skip(); - // But if m_popup was about to get the focus, - // don't disappear. - if (event.GetWindow() != m_popup) + return; + } +#endif // __WXGTK__ + + // when we lose focus we always disappear - unless it goes to the popup (in + // which case we don't really lose it) + wxWindow *win = event.GetWindow(); + while ( win ) + { + if ( win == m_popup ) + return; + win = win->GetParent(); + } + + m_popup->DismissAndNotify(); +} + +void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& event) +{ + // let the window have it first, it might process the keys + if ( !m_popup->ProcessEvent(event) ) + { + // by default, dismiss the popup m_popup->DismissAndNotify(); + } } #endif // wxUSE_POPUPWIN +