X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3390759eb3680ec3730cb7ddb1a5e0649bcbdadc..e795e8b56f213f97745636a017609091746894a0:/src/common/popupcmn.cpp?ds=sidebyside diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp index b1e1eeade7..914fce2d26 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 license +// License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "popupwinbase.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,7 +24,7 @@ #pragma hdrstop #endif -#if wxUSE_POPUPWIN && !defined(__WXMOTIF__) +#if wxUSE_POPUPWIN #include "wx/popupwin.h" @@ -43,12 +39,14 @@ #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__ +#ifdef __WXGTK__ + #include +#endif +#ifdef __WXX11__ +#include "wx/x11/private.h" +#endif +IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow) IMPLEMENT_DYNAMIC_CLASS(wxPopupTransientWindow, wxPopupWindow) #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) @@ -64,7 +62,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPopupTransientWindow, wxPopupWindow) class wxPopupWindowHandler : public wxEvtHandler { public: - wxPopupWindowHandler(wxPopupTransientWindow *popup) { m_popup = popup; } + wxPopupWindowHandler(wxPopupTransientWindow *popup) : m_popup(popup) {} protected: // event handlers @@ -74,36 +72,23 @@ private: wxPopupTransientWindow *m_popup; DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxPopupWindowHandler) }; class wxPopupFocusHandler : public wxEvtHandler { public: - wxPopupFocusHandler(wxPopupTransientWindow *popup) - { - m_popup = popup; - -#ifdef __WXGTK__ - // ignore the next few OnKillFocus() calls - m_creationTime = time(NULL); -#endif // __WXGTK__ - } + wxPopupFocusHandler(wxPopupTransientWindow *popup) : m_popup(popup) {} 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() + DECLARE_NO_COPY_CLASS(wxPopupFocusHandler) }; // ---------------------------------------------------------------------------- @@ -119,6 +104,12 @@ BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler) EVT_KEY_DOWN(wxPopupFocusHandler::OnKeyDown) END_EVENT_TABLE() +BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow) +#ifdef __WXMSW__ + EVT_IDLE(wxPopupTransientWindow::OnIdle) +#endif +END_EVENT_TABLE() + // ============================================================================ // implementation // ============================================================================ @@ -134,7 +125,7 @@ wxPopupWindowBase::~wxPopupWindowBase() bool wxPopupWindowBase::Create(wxWindow* WXUNUSED(parent), int WXUNUSED(flags)) { - return TRUE; + return true; } void wxPopupWindowBase::Position(const wxPoint& ptOrigin, @@ -195,7 +186,11 @@ wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent, int style) wxPopupTransientWindow::~wxPopupTransientWindow() { - PopHandlers(); + if (m_handlerPopup && m_handlerPopup->GetNextHandler()) + PopHandlers(); + + wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler()); + wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler()); delete m_handlerFocus; delete m_handlerPopup; @@ -211,22 +206,22 @@ void wxPopupTransientWindow::PopHandlers() // handler - so don't risk deleting it second time m_handlerPopup = NULL; } - - m_child->ReleaseMouse(); + if (m_child->HasCapture()) + { + m_child->ReleaseMouse(); + } m_child = NULL; } if ( m_focus ) { -#ifndef __WXX11__ if ( !m_focus->RemoveEventHandler(m_handlerFocus) ) { // see above m_handlerFocus = NULL; } -#endif - m_focus = NULL; } + m_focus = NULL; } void wxPopupTransientWindow::Popup(wxWindow *winFocus) @@ -241,49 +236,120 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus) m_child = 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); + // There is is a problem if these are still in use + wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler()); + wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler()); + + if (!m_handlerPopup) + m_handlerPopup = new wxPopupWindowHandler(this); - m_child->CaptureMouse(); m_child->PushEventHandler(m_handlerPopup); m_focus = winFocus ? winFocus : 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(); +#elif defined(__WXGTK__) + // GTK+ catches the activate events from the popup + // window, not the focus events from the child window + m_focus = this; +#endif + if ( m_focus ) -#endif // __WXMSW__ { - delete m_handlerFocus; - m_handlerFocus = new wxPopupFocusHandler(this); + if (!m_handlerFocus) + m_handlerFocus = new wxPopupFocusHandler(this); m_focus->PushEventHandler(m_handlerFocus); } +} + +bool wxPopupTransientWindow::Show( bool show ) +{ +#ifdef __WXGTK__ + if (!show) + { + gdk_pointer_ungrab( (guint32)GDK_CURRENT_TIME ); + + gtk_grab_remove( m_widget ); + } +#endif + +#ifdef __WXX11__ + if (!show) + { + XUngrabPointer( wxGlobalDisplay(), CurrentTime ); + } +#endif + +#ifdef __WXMSW__ + if (!show && m_child && m_child->HasCapture()) + { + m_child->ReleaseMouse(); + } +#endif + + bool ret = wxPopupWindow::Show( show ); + +#ifdef __WXGTK__ + if (show) + { + gtk_grab_add( m_widget ); + + gdk_pointer_grab( m_widget->window, TRUE, + (GdkEventMask) + (GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_RELEASE_MASK | + GDK_POINTER_MOTION_HINT_MASK | + GDK_POINTER_MOTION_MASK), + (GdkWindow *) NULL, + (GdkCursor *) NULL, + (guint32)GDK_CURRENT_TIME ); + } +#endif + +#ifdef __WXX11__ + if (show) + { + Window xwindow = (Window) m_clientWindow; + + /* int res =*/ XGrabPointer(wxGlobalDisplay(), xwindow, + True, + ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, + GrabModeAsync, + GrabModeAsync, + None, + None, + CurrentTime ); + } +#endif + +#ifdef __WXMSW__ + if (show && m_child) + { + // Assume that the mouse is outside the popup to begin with + m_child->CaptureMouse(); + } +#endif -#endif // !__WXX11__ + return ret; } void wxPopupTransientWindow::Dismiss() { - PopHandlers(); - Hide(); + PopHandlers(); } void wxPopupTransientWindow::DismissAndNotify() { Dismiss(); - OnDismiss(); } @@ -295,8 +361,37 @@ void wxPopupTransientWindow::OnDismiss() bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event)) { // no special processing here - return FALSE; + return false; +} + +#ifdef __WXMSW__ +void wxPopupTransientWindow::OnIdle(wxIdleEvent& event) +{ + event.Skip(); + + if (IsShown() && m_child) + { + wxPoint pos = ScreenToClient(wxGetMousePosition()); + wxRect rect(GetSize()); + + if ( rect.Inside(pos) ) + { + if ( m_child->HasCapture() ) + { + m_child->ReleaseMouse(); + } + } + else + { + if ( !m_child->HasCapture() ) + { + m_child->CaptureMouse(); + } + } + } } +#endif // __WXMSW__ + #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) @@ -304,6 +399,10 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event)) // wxPopupComboWindow // ---------------------------------------------------------------------------- +BEGIN_EVENT_TABLE(wxPopupComboWindow, wxPopupTransientWindow) + EVT_KEY_DOWN(wxPopupComboWindow::OnKeyDown) +END_EVENT_TABLE() + wxPopupComboWindow::wxPopupComboWindow(wxComboControl *parent) : wxPopupTransientWindow(parent) { @@ -320,7 +419,7 @@ bool wxPopupComboWindow::Create(wxComboControl *parent) void wxPopupComboWindow::PositionNearCombo() { // the origin point must be in screen coords - wxPoint ptOrigin = m_combo->ClientToScreen(wxPoint(0, 0)); + wxPoint ptOrigin = m_combo->ClientToScreen(wxPoint(0,0)); #if 0 //def __WXUNIVERSAL__ // account for the fact that (0, 0) is not the top left corner of the @@ -341,6 +440,11 @@ void wxPopupComboWindow::OnDismiss() m_combo->OnDismiss(); } +void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event) +{ + m_combo->ProcessEvent(event); +} + #endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) // ---------------------------------------------------------------------------- @@ -358,7 +462,7 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) wxPoint pos = event.GetPosition(); - // scrollbar on which the click occured + // scrollbar on which the click occurred wxWindow *sbar = NULL; wxWindow *win = (wxWindow *)event.GetEventObject(); @@ -379,15 +483,15 @@ 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; @@ -437,16 +541,6 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event) void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event) { -#ifdef __WXGTK__ - // ignore the next OnKillFocus() call - if ( time(NULL) < m_creationTime + 1 ) - { - event.Skip(); - - 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();