X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad7f2e868b2147c875277df51980c8efb30140c8..98e04c1376e251d11804371233a52cccbcf34cc0:/src/common/popupcmn.cpp

diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index cd78e16a75..914fce2d26 100644
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -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"
 
@@ -67,7 +63,6 @@ class wxPopupWindowHandler : public wxEvtHandler
 {
 public:
     wxPopupWindowHandler(wxPopupTransientWindow *popup) : m_popup(popup) {}
-    ~wxPopupWindowHandler();
 
 protected:
     // event handlers
@@ -84,7 +79,6 @@ class wxPopupFocusHandler : public wxEvtHandler
 {
 public:
     wxPopupFocusHandler(wxPopupTransientWindow *popup) : m_popup(popup) {}
-    ~wxPopupFocusHandler();
 
 protected:
     void OnKillFocus(wxFocusEvent& event);
@@ -110,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
 // ============================================================================
@@ -168,14 +168,6 @@ void wxPopupWindowBase::Position(const wxPoint& ptOrigin,
 // wxPopupTransientWindow
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow)
-#ifdef __WXMSW__
-    EVT_ENTER_WINDOW(wxPopupTransientWindow::OnEnter)
-    EVT_LEAVE_WINDOW(wxPopupTransientWindow::OnLeave)
-    EVT_LEFT_DOWN(wxPopupTransientWindow::OnLeftDown)
-#endif
-END_EVENT_TABLE()
-
 void wxPopupTransientWindow::Init()
 {
     m_child =
@@ -194,50 +186,41 @@ 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;
 }
 
 void wxPopupTransientWindow::PopHandlers()
 {
     if ( m_child )
     {
-        if ( m_handlerPopup && !m_child->RemoveEventHandler(m_handlerPopup) )
+        if ( !m_child->RemoveEventHandler(m_handlerPopup) )
         {
             // something is very wrong and someone else probably deleted our
             // handler - so don't risk deleting it second time
             m_handlerPopup = NULL;
         }
-
+        if (m_child->HasCapture())
+        {
+            m_child->ReleaseMouse();
+        }
         m_child = NULL;
     }
 
-#ifdef __WXMSW__
-    if ( HasCapture() )
-    {
-        ReleaseMouse();
-    }    
     if ( m_focus )
     {
-        if ( m_handlerFocus && !m_focus->RemoveEventHandler(m_handlerFocus) )
+        if ( !m_focus->RemoveEventHandler(m_handlerFocus) )
         {
             // see above
             m_handlerFocus = NULL;
         }
     }
-#else
-    if ( m_handlerFocus && !RemoveEventHandler(m_handlerFocus) )
-    {
-        // see above
-        m_handlerFocus = NULL;
-    }
-#endif
-
-    // delete the handlers, they'll be created as necessary in Popup()
-    delete m_handlerPopup;
-    m_handlerPopup = NULL;
-    delete m_handlerFocus;
-    m_handlerFocus = NULL;
-
     m_focus = NULL;
 }
 
@@ -255,12 +238,12 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus)
 
     Show();
 
-    // There is is a problem if these are still valid
-    wxASSERT_MSG(!m_handlerPopup, wxT("Popup handler not deleted"));
-    wxASSERT_MSG(!m_handlerFocus, wxT("Focus handler not deleted"));
+    // There is is a problem if these are still in use
+    wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler());
+    wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler());
 
-    delete m_handlerPopup;
-    m_handlerPopup = new wxPopupWindowHandler(this);
+    if (!m_handlerPopup)
+        m_handlerPopup = new wxPopupWindowHandler(this);
 
     m_child->PushEventHandler(m_handlerPopup);
 
@@ -272,46 +255,19 @@ 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();
-    if ( m_focus )
-    {
-        delete m_handlerFocus;
-        m_handlerFocus = new wxPopupFocusHandler(this);
-
-        m_focus->PushEventHandler(m_handlerFocus);
-    }
-#else
+#elif defined(__WXGTK__)
     // GTK+ catches the activate events from the popup
     // window, not the focus events from the child window
-    delete m_handlerFocus;
-    m_handlerFocus = new wxPopupFocusHandler(this);
-    PushEventHandler(m_handlerFocus);
-#endif // __WXMSW__
-
-    // 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);
-    m_focus->Connect(wxEVT_DESTROY,
-                     wxWindowDestroyEventHandler(wxPopupTransientWindow::OnDestroy),
-                     NULL, this);
-#ifdef __WXMSW__
-    // Assume that the mouse is currently outside of the popup window
-    CaptureMouse();
+    m_focus = this;
+#endif
 
-    // Connect the child Enter/Leave events too, incase the child completly
-    // covers the popup (because then the popup's enter/leave events won't be
-    // sent.
-    if (m_child != this)
+    if ( m_focus )
     {
-        m_child->Connect(wxEVT_ENTER_WINDOW,
-                         wxMouseEventHandler(wxPopupTransientWindow::OnChildEnter),
-                         NULL, this);
-        m_child->Connect(wxEVT_LEAVE_WINDOW,
-                         wxMouseEventHandler(wxPopupTransientWindow::OnChildLeave),
-                         NULL, this);
+        if (!m_handlerFocus)
+            m_handlerFocus = new wxPopupFocusHandler(this);
+
+        m_focus->PushEventHandler(m_handlerFocus);
     }
-#endif
 }
 
 bool wxPopupTransientWindow::Show( bool show )
@@ -332,6 +288,13 @@ bool wxPopupTransientWindow::Show( bool show )
     }
 #endif
 
+#ifdef __WXMSW__
+    if (!show && m_child && m_child->HasCapture())
+    {
+        m_child->ReleaseMouse();
+    }
+#endif
+
     bool ret = wxPopupWindow::Show( show );
 
 #ifdef __WXGTK__
@@ -366,20 +329,27 @@ bool wxPopupTransientWindow::Show( bool show )
             CurrentTime );
     }
 #endif
+
+#ifdef __WXMSW__
+    if (show && m_child)
+    {
+        // Assume that the mouse is outside the popup to begin with
+        m_child->CaptureMouse();
+    }
+#endif
+
     return ret;
 }
 
 void wxPopupTransientWindow::Dismiss()
 {
-    PopHandlers();
-
     Hide();
+    PopHandlers();
 }
 
 void wxPopupTransientWindow::DismissAndNotify()
 {
     Dismiss();
-
     OnDismiss();
 }
 
@@ -394,65 +364,34 @@ 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;
-}
-
-void wxPopupTransientWindow::OnEnter(wxMouseEvent& /*event*/)
-{
-    if ( HasCapture() )
-    {
-        ReleaseMouse();
-    }    
-}
-
-void wxPopupTransientWindow::OnLeave(wxMouseEvent& /*event*/)
+#ifdef __WXMSW__
+void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
 {
-    CaptureMouse();
-}
+    event.Skip();
 
-void wxPopupTransientWindow::OnLeftDown(wxMouseEvent& event)
-{
-    if (m_handlerPopup && m_child && m_child != this)
+    if (IsShown() && m_child)
     {
-        m_child->GetEventHandler()->ProcessEvent(event);
-    }
-}
-
+        wxPoint pos = ScreenToClient(wxGetMousePosition());
+        wxRect rect(GetSize());
 
-
-// If the child is the same size as the popup window then handle the event,
-// otherwise assume that there is enough of the popup showing that it will get
-// it's own Enter/Leave events.  A more reliable way to detect this situation
-// would be appreciated...
-
-void wxPopupTransientWindow::OnChildEnter(wxMouseEvent& event)
-{
-    if (m_child)
-    {
-        wxSize cs = m_child->GetSize();
-        wxSize ps = GetClientSize();
-        
-        if ((cs.x * cs.y) >= (ps.x * ps.y))
-            OnEnter(event);
+        if ( rect.Inside(pos) )
+        {
+            if ( m_child->HasCapture() )
+            {
+                m_child->ReleaseMouse();
+            }
+        }
+        else
+        {
+            if ( !m_child->HasCapture() )
+            {
+                m_child->CaptureMouse();
+            }
+        }
     }
 }
+#endif // __WXMSW__
 
-void wxPopupTransientWindow::OnChildLeave(wxMouseEvent& event)
-{
-    if (m_child)
-    {
-        wxSize cs = m_child->GetSize();
-        wxSize ps = GetClientSize();
-        
-        if ((cs.x * cs.y) >= (ps.x * ps.y))
-            OnLeave(event);
-    }
-}
 
 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
 
@@ -511,11 +450,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)
 {
@@ -528,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();
@@ -549,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;
@@ -604,11 +538,6 @@ void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
 // ----------------------------------------------------------------------------
 // wxPopupFocusHandler
 // ----------------------------------------------------------------------------
-wxPopupFocusHandler::~wxPopupFocusHandler()
-{
-    if (m_popup && (m_popup->m_handlerFocus == this))
-        m_popup->m_handlerFocus = NULL;
-}
 
 void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event)
 {