X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17a1ebd101f0653e69736416a2a28d0ada423141..aa4919edd16047bb9590658f7a9fbe50fc659bc1:/src/common/popupcmn.cpp diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp index 914fce2d26..65a487e2de 100644 --- a/src/common/popupcmn.cpp +++ b/src/common/popupcmn.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: common/popupcmn.cpp +// Name: src/common/popupcmn.cpp // Purpose: implementation of wxPopupTransientWindow // Author: Vadim Zeitlin // Modified by: @@ -29,21 +29,25 @@ #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" +#elif defined(__WXMSW__) + #include "wx/msw/private.h" +#elif defined(__WXX11__) + #include "wx/x11/private.h" #endif IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow) @@ -72,7 +76,7 @@ private: wxPopupTransientWindow *m_popup; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxPopupWindowHandler) + wxDECLARE_NO_COPY_CLASS(wxPopupWindowHandler); }; class wxPopupFocusHandler : public wxEvtHandler @@ -88,7 +92,7 @@ private: wxPopupTransientWindow *m_popup; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxPopupFocusHandler) + wxDECLARE_NO_COPY_CLASS(wxPopupFocusHandler); }; // ---------------------------------------------------------------------------- @@ -105,7 +109,7 @@ BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler) END_EVENT_TABLE() BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow) -#ifdef __WXMSW__ +#if defined( __WXMSW__ ) || defined( __WXMAC__) EVT_IDLE(wxPopupTransientWindow::OnIdle) #endif END_EVENT_TABLE() @@ -131,13 +135,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 ) @@ -149,8 +171,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 ) @@ -171,7 +204,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; @@ -238,7 +271,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()); @@ -247,10 +280,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 @@ -288,7 +329,7 @@ bool wxPopupTransientWindow::Show( bool show ) } #endif -#ifdef __WXMSW__ +#if defined( __WXMSW__ ) || defined( __WXMAC__) if (!show && m_child && m_child->HasCapture()) { m_child->ReleaseMouse(); @@ -308,8 +349,8 @@ bool wxPopupTransientWindow::Show( bool show ) GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_POINTER_MOTION_MASK), - (GdkWindow *) NULL, - (GdkCursor *) NULL, + NULL, + NULL, (guint32)GDK_CURRENT_TIME ); } #endif @@ -330,7 +371,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 @@ -364,7 +405,7 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event)) return false; } -#ifdef __WXMSW__ +#if defined( __WXMSW__ ) || defined( __WXMAC__) void wxPopupTransientWindow::OnIdle(wxIdleEvent& event) { event.Skip(); @@ -374,7 +415,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() ) { @@ -403,13 +444,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; @@ -437,12 +478,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__) @@ -462,8 +503,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(); @@ -491,12 +535,12 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) winUnder->ScreenToClient(&event2.m_x, &event2.m_y); event2.SetEventObject(winUnder); - wxPostEvent(winUnder, event2); + wxPostEvent(winUnder->GetEventHandler(), event2); } } break; -#ifdef __WXUNIVERSAL__ +#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR case wxHT_WINDOW_HORZ_SCROLLBAR: sbar = win->GetScrollbar(wxHORIZONTAL); break; @@ -504,11 +548,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: @@ -521,6 +565,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) break; } +#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR if ( sbar ) { // translate the event coordinates to the scrollbar ones @@ -533,6 +578,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) (void)sbar->GetEventHandler()->ProcessEvent(event2); } +#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR } // ---------------------------------------------------------------------------- @@ -556,8 +602,18 @@ void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event) void wxPopupFocusHandler::OnKeyDown(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(); @@ -565,4 +621,3 @@ void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& event) } #endif // wxUSE_POPUPWIN -