X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0bf16170cca9c353970e600521aa321d26509397..48271822ef3d56c8f91af882b68fd1b674a8e8e6:/src/common/popupcmn.cpp?ds=sidebyside diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp index 5876f6b03c..57ba86c0a0 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: @@ -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,14 +29,16 @@ #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/recguard.h" + #ifdef __WXUNIVERSAL__ #include "wx/univ/renderer.h" + #include "wx/scrolbar.h" #endif // __WXUNIVERSAL__ #ifdef __WXGTK__ @@ -67,7 +65,6 @@ class wxPopupWindowHandler : public wxEvtHandler { public: wxPopupWindowHandler(wxPopupTransientWindow *popup) : m_popup(popup) {} - ~wxPopupWindowHandler(); protected: // event handlers @@ -84,7 +81,6 @@ class wxPopupFocusHandler : public wxEvtHandler { public: wxPopupFocusHandler(wxPopupTransientWindow *popup) : m_popup(popup) {} - ~wxPopupFocusHandler(); protected: void OnKillFocus(wxFocusEvent& event); @@ -155,7 +151,18 @@ void wxPopupWindowBase::Position(const wxPoint& ptOrigin, } // now check left/right too - wxCoord x = ptOrigin.x + size.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 > sizeScreen.x ) { // check if there is enough space to the left @@ -194,7 +201,7 @@ wxPopupTransientWindow::~wxPopupTransientWindow() { if (m_handlerPopup && m_handlerPopup->GetNextHandler()) PopHandlers(); - + wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler()); wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler()); @@ -213,7 +220,7 @@ void wxPopupTransientWindow::PopHandlers() m_handlerPopup = NULL; } if (m_child->HasCapture()) - { + { m_child->ReleaseMouse(); } m_child = NULL; @@ -261,7 +268,7 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus) // 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; @@ -274,16 +281,6 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus) m_focus->PushEventHandler(m_handlerFocus); } - - // catch destroy events, if you close a program with a popup shown in MSW - // you get a segfault if m_child or m_focus are deleted before this is - m_child->Connect(wxEVT_DESTROY, - wxWindowDestroyEventHandler(wxPopupTransientWindow::OnDestroy), - NULL, this); - if (m_focus) - m_focus->Connect(wxEVT_DESTROY, - wxWindowDestroyEventHandler(wxPopupTransientWindow::OnDestroy), - NULL, this); } bool wxPopupTransientWindow::Show( bool show ) @@ -306,11 +303,11 @@ bool wxPopupTransientWindow::Show( bool show ) #ifdef __WXMSW__ if (!show && m_child && m_child->HasCapture()) - { + { m_child->ReleaseMouse(); } #endif - + bool ret = wxPopupWindow::Show( show ); #ifdef __WXGTK__ @@ -380,14 +377,6 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event)) return false; } -void wxPopupTransientWindow::OnDestroy(wxWindowDestroyEvent& event) -{ - if (event.GetEventObject() == m_child) - m_child = NULL; - if (event.GetEventObject() == m_focus) - m_focus = NULL; -} - #ifdef __WXMSW__ void wxPopupTransientWindow::OnIdle(wxIdleEvent& event) { @@ -398,7 +387,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() ) { @@ -411,10 +400,10 @@ void wxPopupTransientWindow::OnIdle(wxIdleEvent& event) { m_child->CaptureMouse(); } - } + } } } -#endif +#endif // __WXMSW__ #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) @@ -427,13 +416,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; @@ -461,7 +450,7 @@ void wxPopupComboWindow::PositionNearCombo() void wxPopupComboWindow::OnDismiss() { - m_combo->OnDismiss(); + m_combo->OnPopupDismiss(); } void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event) @@ -474,11 +463,6 @@ void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event) // ---------------------------------------------------------------------------- // wxPopupWindowHandler // ---------------------------------------------------------------------------- -wxPopupWindowHandler::~wxPopupWindowHandler() -{ - if (m_popup && (m_popup->m_handlerPopup == this)) - m_popup->m_handlerPopup = NULL; -} void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) { @@ -491,8 +475,11 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) wxPoint pos = event.GetPosition(); - // scrollbar on which the click occured + // 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(); @@ -512,20 +499,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, event2); } } break; -#ifdef __WXUNIVERSAL__ +#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR case wxHT_WINDOW_HORZ_SCROLLBAR: sbar = win->GetScrollbar(wxHORIZONTAL); break; @@ -533,7 +520,7 @@ 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? @@ -550,6 +537,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) break; } +#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR if ( sbar ) { // translate the event coordinates to the scrollbar ones @@ -562,16 +550,12 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) (void)sbar->GetEventHandler()->ProcessEvent(event2); } +#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR } // ---------------------------------------------------------------------------- // wxPopupFocusHandler // ---------------------------------------------------------------------------- -wxPopupFocusHandler::~wxPopupFocusHandler() -{ - if (m_popup && (m_popup->m_handlerFocus == this)) - m_popup->m_handlerFocus = NULL; -} void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event) { @@ -590,8 +574,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(); @@ -599,4 +593,3 @@ void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& event) } #endif // wxUSE_POPUPWIN -