X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/31ad2c402c0c626401bbb5b015001c6193cc0bf1..d57d0505d4c2186592833f18c3d40532d3a4bf0e:/src/common/popupcmn.cpp diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp index 5150d08a04..4d94eaa688 100644 --- a/src/common/popupcmn.cpp +++ b/src/common/popupcmn.cpp @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: common/popupcmn.cpp +// Name: src/common/popupcmn.cpp // Purpose: implementation of wxPopupTransientWindow // Author: Vadim Zeitlin // Modified by: // Created: 06.01.01 // RCS-ID: $Id$ // Copyright: (c) 2001 Vadim Zeitlin -// License: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "popupwinbase.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -33,21 +29,30 @@ #include "wx/popupwin.h" #ifndef WX_PRECOMP - #include "wx/combobox.h" // wxComboControl + #include "wx/combobox.h" // wxComboCtrl #include "wx/app.h" // wxPostEvent #include "wx/log.h" - #include "wx/app.h" #endif //WX_PRECOMP +#include "wx/display.h" +#include "wx/recguard.h" + #ifdef __WXUNIVERSAL__ #include "wx/univ/renderer.h" + #include "wx/scrolbar.h" #endif // __WXUNIVERSAL__ #ifdef __WXGTK__ #include -#endif -#ifdef __WXX11__ -#include "wx/x11/private.h" + #if GTK_CHECK_VERSION(2,0,0) + #include "wx/gtk/private/gtk2-compat.h" + #else + #define gtk_widget_get_window(x) x->window + #endif +#elif defined(__WXMSW__) + #include "wx/msw/private.h" +#elif defined(__WXX11__) + #include "wx/x11/private.h" #endif IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow) @@ -71,12 +76,13 @@ public: protected: // event handlers void OnLeftDown(wxMouseEvent& event); + void OnCaptureLost(wxMouseCaptureLostEvent& event); private: wxPopupTransientWindow *m_popup; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxPopupWindowHandler) + wxDECLARE_NO_COPY_CLASS(wxPopupWindowHandler); }; class wxPopupFocusHandler : public wxEvtHandler @@ -86,13 +92,13 @@ public: protected: void OnKillFocus(wxFocusEvent& event); - void OnKeyDown(wxKeyEvent& event); + void OnChar(wxKeyEvent& event); private: wxPopupTransientWindow *m_popup; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxPopupFocusHandler) + wxDECLARE_NO_COPY_CLASS(wxPopupFocusHandler); }; // ---------------------------------------------------------------------------- @@ -101,15 +107,16 @@ private: BEGIN_EVENT_TABLE(wxPopupWindowHandler, wxEvtHandler) EVT_LEFT_DOWN(wxPopupWindowHandler::OnLeftDown) + EVT_MOUSE_CAPTURE_LOST(wxPopupWindowHandler::OnCaptureLost) END_EVENT_TABLE() BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler) EVT_KILL_FOCUS(wxPopupFocusHandler::OnKillFocus) - EVT_KEY_DOWN(wxPopupFocusHandler::OnKeyDown) + EVT_CHAR(wxPopupFocusHandler::OnChar) END_EVENT_TABLE() BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow) -#ifdef __WXMSW__ +#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_CARBON) EVT_IDLE(wxPopupTransientWindow::OnIdle) #endif END_EVENT_TABLE() @@ -135,13 +142,31 @@ bool wxPopupWindowBase::Create(wxWindow* WXUNUSED(parent), int WXUNUSED(flags)) void wxPopupWindowBase::Position(const wxPoint& ptOrigin, const wxSize& size) { - wxSize sizeScreen = wxGetDisplaySize(), - sizeSelf = GetSize(); + // determine the position and size of the screen we clamp the popup to + wxPoint posScreen; + wxSize sizeScreen; + + const int displayNum = wxDisplay::GetFromPoint(ptOrigin); + if ( displayNum != wxNOT_FOUND ) + { + const wxRect rectScreen = wxDisplay(displayNum).GetGeometry(); + posScreen = rectScreen.GetPosition(); + sizeScreen = rectScreen.GetSize(); + } + else // outside of any display? + { + // just use the primary one then + posScreen = wxPoint(0, 0); + sizeScreen = wxGetDisplaySize(); + } + + + const wxSize sizeSelf = GetSize(); // is there enough space to put the popup below the window (where we put it // by default)? wxCoord y = ptOrigin.y + size.y; - if ( y + sizeSelf.y > sizeScreen.y ) + if ( y + sizeSelf.y > posScreen.y + sizeScreen.y ) { // check if there is enough space above if ( ptOrigin.y > sizeSelf.y ) @@ -153,8 +178,19 @@ void wxPopupWindowBase::Position(const wxPoint& ptOrigin, } // now check left/right too - wxCoord x = ptOrigin.x + size.x; - if ( x + sizeSelf.x > sizeScreen.x ) + wxCoord x = ptOrigin.x; + + if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft ) + { + // shift the window to the left instead of the right. + x -= size.x; + x -= sizeSelf.x; // also shift it by window width. + } + else + x += size.x; + + + if ( x + sizeSelf.x > posScreen.x + sizeScreen.x ) { // check if there is enough space to the left if ( ptOrigin.x > sizeSelf.x ) @@ -175,7 +211,7 @@ void wxPopupWindowBase::Position(const wxPoint& ptOrigin, void wxPopupTransientWindow::Init() { m_child = - m_focus = (wxWindow *)NULL; + m_focus = NULL; m_handlerFocus = NULL; m_handlerPopup = NULL; @@ -192,7 +228,7 @@ wxPopupTransientWindow::~wxPopupTransientWindow() { if (m_handlerPopup && m_handlerPopup->GetNextHandler()) PopHandlers(); - + wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler()); wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler()); @@ -211,7 +247,7 @@ void wxPopupTransientWindow::PopHandlers() m_handlerPopup = NULL; } if (m_child->HasCapture()) - { + { m_child->ReleaseMouse(); } m_child = NULL; @@ -242,7 +278,7 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus) Show(); - // There is is a problem if these are still in use + // There is a problem if these are still in use wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler()); wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler()); @@ -251,15 +287,23 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus) m_child->PushEventHandler(m_handlerPopup); - m_focus = winFocus ? winFocus : this; - m_focus->SetFocus(); +#if defined(__WXMSW__) + // Focusing on child of popup window does not work on MSW unless WS_POPUP + // style is set. We do not even want to try to set the focus, as it may + // provoke errors on some Windows versions (Vista and later). + if ( ::GetWindowLong(GetHwnd(), GWL_STYLE) & WS_POPUP ) +#endif + { + m_focus = winFocus ? winFocus : this; + m_focus->SetFocus(); + } -#ifdef __WXMSW__ +#if defined( __WXMSW__ ) || (defined( __WXMAC__) && wxOSX_USE_CARBON) // 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(); -#elif __WXGTK__ +#elif defined(__WXGTK__) // GTK+ catches the activate events from the popup // window, not the focus events from the child window m_focus = this; @@ -292,13 +336,13 @@ bool wxPopupTransientWindow::Show( bool show ) } #endif -#ifdef __WXMSW__ +#if defined( __WXMSW__ ) || defined( __WXMAC__) if (!show && m_child && m_child->HasCapture()) - { + { m_child->ReleaseMouse(); } #endif - + bool ret = wxPopupWindow::Show( show ); #ifdef __WXGTK__ @@ -306,14 +350,14 @@ bool wxPopupTransientWindow::Show( bool show ) { gtk_grab_add( m_widget ); - gdk_pointer_grab( m_widget->window, TRUE, + gdk_pointer_grab( gtk_widget_get_window(m_widget), true, (GdkEventMask) (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_POINTER_MOTION_MASK), - (GdkWindow *) NULL, - (GdkCursor *) NULL, + NULL, + NULL, (guint32)GDK_CURRENT_TIME ); } #endif @@ -334,7 +378,7 @@ bool wxPopupTransientWindow::Show( bool show ) } #endif -#ifdef __WXMSW__ +#if defined( __WXMSW__ ) || defined( __WXMAC__) if (show && m_child) { // Assume that the mouse is outside the popup to begin with @@ -345,6 +389,20 @@ bool wxPopupTransientWindow::Show( bool show ) return ret; } +bool wxPopupTransientWindow::Destroy() +{ + // The popup window can be deleted at any moment, even while some events + // are still being processed for it, so delay its real destruction until + // the next idle time when we're sure that it's safe to really destroy it. + + wxCHECK_MSG( !wxPendingDelete.Member(this), false, + wxS("Shouldn't destroy the popup twice.") ); + + wxPendingDelete.Append(this); + + return true; +} + void wxPopupTransientWindow::Dismiss() { Hide(); @@ -368,7 +426,7 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event)) return false; } -#ifdef __WXMSW__ +#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_CARBON) void wxPopupTransientWindow::OnIdle(wxIdleEvent& event) { event.Skip(); @@ -378,7 +436,7 @@ void wxPopupTransientWindow::OnIdle(wxIdleEvent& event) wxPoint pos = ScreenToClient(wxGetMousePosition()); wxRect rect(GetSize()); - if ( rect.Inside(pos) ) + if ( rect.Contains(pos) ) { if ( m_child->HasCapture() ) { @@ -391,10 +449,10 @@ void wxPopupTransientWindow::OnIdle(wxIdleEvent& event) { m_child->CaptureMouse(); } - } + } } } -#endif +#endif // wxOSX/Carbon #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) @@ -407,13 +465,13 @@ BEGIN_EVENT_TABLE(wxPopupComboWindow, wxPopupTransientWindow) EVT_KEY_DOWN(wxPopupComboWindow::OnKeyDown) END_EVENT_TABLE() -wxPopupComboWindow::wxPopupComboWindow(wxComboControl *parent) +wxPopupComboWindow::wxPopupComboWindow(wxComboCtrl *parent) : wxPopupTransientWindow(parent) { m_combo = parent; } -bool wxPopupComboWindow::Create(wxComboControl *parent) +bool wxPopupComboWindow::Create(wxComboCtrl *parent) { m_combo = parent; @@ -441,12 +499,12 @@ void wxPopupComboWindow::PositionNearCombo() void wxPopupComboWindow::OnDismiss() { - m_combo->OnDismiss(); + m_combo->OnPopupDismiss(true); } void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event) { - m_combo->ProcessEvent(event); + m_combo->ProcessWindowEvent(event); } #endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) @@ -466,8 +524,11 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) wxPoint pos = event.GetPosition(); + // in non-Univ ports the system manages scrollbars for us +#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR // scrollbar on which the click occurred wxWindow *sbar = NULL; +#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR wxWindow *win = (wxWindow *)event.GetEventObject(); @@ -487,20 +548,20 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) // 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 ) + wxWindow *winUnder = wxFindWindowAtPoint(event2.GetPosition()); + if ( winUnder ) { // 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); + winUnder->ScreenToClient(&event2.m_x, &event2.m_y); - event2.SetEventObject(win); - wxPostEvent(win, event2); + event2.SetEventObject(winUnder); + wxPostEvent(winUnder->GetEventHandler(), event2); } } break; -#ifdef __WXUNIVERSAL__ +#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR case wxHT_WINDOW_HORZ_SCROLLBAR: sbar = win->GetScrollbar(wxHORIZONTAL); break; @@ -508,11 +569,11 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) case wxHT_WINDOW_VERT_SCROLLBAR: sbar = win->GetScrollbar(wxVERTICAL); break; -#endif +#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR default: // forgot to update the switch after adding a new hit test code? - wxFAIL_MSG( _T("unexpected HitTest() return value") ); + wxFAIL_MSG( wxT("unexpected HitTest() return value") ); // fall through case wxHT_WINDOW_CORNER: @@ -525,6 +586,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) break; } +#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR if ( sbar ) { // translate the event coordinates to the scrollbar ones @@ -537,6 +599,16 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) (void)sbar->GetEventHandler()->ProcessEvent(event2); } +#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR +} + +void +wxPopupWindowHandler::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event)) +{ + m_popup->DismissAndNotify(); + + // There is no need to skip the event here, normally we've already dealt + // with the focus loss. } // ---------------------------------------------------------------------------- @@ -558,10 +630,20 @@ void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event) m_popup->DismissAndNotify(); } -void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& event) +void wxPopupFocusHandler::OnChar(wxKeyEvent& event) { + // we can be associated with the popup itself in which case we should avoid + // infinite recursion + static int s_inside; + wxRecursionGuard guard(s_inside); + if ( guard.IsInside() ) + { + event.Skip(); + return; + } + // let the window have it first, it might process the keys - if ( !m_popup->ProcessEvent(event) ) + if ( !m_popup->GetEventHandler()->ProcessEvent(event) ) { // by default, dismiss the popup m_popup->DismissAndNotify(); @@ -569,4 +651,3 @@ void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& event) } #endif // wxUSE_POPUPWIN -