X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d2aa263fd120a01843fb40a063abe8c6ff921cbc..08670ea85abf4b4946a9ce64971b591d7b1ee30b:/src/common/popupcmn.cpp?ds=sidebyside diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp index 57ba86c0a0..4d94eaa688 100644 --- a/src/common/popupcmn.cpp +++ b/src/common/popupcmn.cpp @@ -6,7 +6,7 @@ // Created: 06.01.01 // RCS-ID: $Id$ // Copyright: (c) 2001 Vadim Zeitlin -// License: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -34,6 +34,7 @@ #include "wx/log.h" #endif //WX_PRECOMP +#include "wx/display.h" #include "wx/recguard.h" #ifdef __WXUNIVERSAL__ @@ -43,9 +44,15 @@ #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) @@ -69,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 @@ -84,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); }; // ---------------------------------------------------------------------------- @@ -99,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() @@ -133,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 ) @@ -152,7 +179,7 @@ void wxPopupWindowBase::Position(const wxPoint& ptOrigin, // now check left/right too wxCoord x = ptOrigin.x; - + if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft ) { // shift the window to the left instead of the right. @@ -162,8 +189,8 @@ void wxPopupWindowBase::Position(const wxPoint& ptOrigin, else x += size.x; - - if ( x + sizeSelf.x > sizeScreen.x ) + + if ( x + sizeSelf.x > posScreen.x + sizeScreen.x ) { // check if there is enough space to the left if ( ptOrigin.x > sizeSelf.x ) @@ -184,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; @@ -251,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()); @@ -260,10 +287,18 @@ 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 @@ -301,7 +336,7 @@ bool wxPopupTransientWindow::Show( bool show ) } #endif -#ifdef __WXMSW__ +#if defined( __WXMSW__ ) || defined( __WXMAC__) if (!show && m_child && m_child->HasCapture()) { m_child->ReleaseMouse(); @@ -315,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 @@ -343,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 @@ -354,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(); @@ -377,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(); @@ -403,7 +452,7 @@ void wxPopupTransientWindow::OnIdle(wxIdleEvent& event) } } } -#endif // __WXMSW__ +#endif // wxOSX/Carbon #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) @@ -450,12 +499,12 @@ void wxPopupComboWindow::PositionNearCombo() void wxPopupComboWindow::OnDismiss() { - m_combo->OnPopupDismiss(); + m_combo->OnPopupDismiss(true); } void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event) { - m_combo->ProcessEvent(event); + m_combo->ProcessWindowEvent(event); } #endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) @@ -507,7 +556,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) winUnder->ScreenToClient(&event2.m_x, &event2.m_y); event2.SetEventObject(winUnder); - wxPostEvent(winUnder, event2); + wxPostEvent(winUnder->GetEventHandler(), event2); } } break; @@ -524,7 +573,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) 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: @@ -553,6 +602,15 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) #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. +} + // ---------------------------------------------------------------------------- // wxPopupFocusHandler // ---------------------------------------------------------------------------- @@ -572,7 +630,7 @@ 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