X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c51c4752023d10f398e5480bf3e22e32ba68edac..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/common/popupcmn.cpp?ds=inline

diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index 79b3bbf23b..cec606e52e 100644
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -66,7 +66,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxPopupTransientWindow, wxPopupWindow)
 class wxPopupWindowHandler : public wxEvtHandler
 {
 public:
-    wxPopupWindowHandler(wxPopupTransientWindow *popup) { m_popup = popup; }
+    wxPopupWindowHandler(wxPopupTransientWindow *popup) : m_popup(popup) {}
+    ~wxPopupWindowHandler();
 
 protected:
     // event handlers
@@ -82,10 +83,8 @@ private:
 class wxPopupFocusHandler : public wxEvtHandler
 {
 public:
-    wxPopupFocusHandler(wxPopupTransientWindow *popup)
-    {
-        m_popup = popup;
-    }
+    wxPopupFocusHandler(wxPopupTransientWindow *popup) : m_popup(popup) {}
+    ~wxPopupFocusHandler();
 
 protected:
     void OnKillFocus(wxFocusEvent& event);
@@ -111,6 +110,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
 // ============================================================================
@@ -187,47 +192,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;
         }
-
-        // m_child->ReleaseMouse();
+        if (m_child->HasCapture())
+        {       
+            m_child->ReleaseMouse();
+        }
         m_child = NULL;
     }
 
-#ifdef __WXMSW__
     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;
 }
 
@@ -245,10 +244,13 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus)
 
     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;
@@ -259,21 +261,29 @@ 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__
+    // GTK+ catches the activate events from the popup
+    // window, not the focus events from the child window
+    m_focus = this;
+#endif
+
     if ( m_focus )
     {
-        delete m_handlerFocus;
-        m_handlerFocus = new wxPopupFocusHandler(this);
+        if (!m_handlerFocus)
+            m_handlerFocus = new wxPopupFocusHandler(this);
 
         m_focus->PushEventHandler(m_handlerFocus);
     }
-#else
-    // 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);
+    if (m_focus)
+        m_focus->Connect(wxEVT_DESTROY,
+                         wxWindowDestroyEventHandler(wxPopupTransientWindow::OnDestroy),
+                         NULL, this);
 }
 
 bool wxPopupTransientWindow::Show( bool show )
@@ -282,7 +292,7 @@ bool wxPopupTransientWindow::Show( bool show )
     if (!show)
     {
         gdk_pointer_ungrab( (guint32)GDK_CURRENT_TIME );
-    
+
         gtk_grab_remove( m_widget );
     }
 #endif
@@ -294,13 +304,20 @@ bool wxPopupTransientWindow::Show( bool show )
     }
 #endif
 
-    bool ret = wxPopupWindow::Show( show );
+#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 |
@@ -317,7 +334,7 @@ bool wxPopupTransientWindow::Show( bool show )
     if (show)
     {
         Window xwindow = (Window) m_clientWindow;
-        
+
         /* int res =*/ XGrabPointer(wxGlobalDisplay(), xwindow,
             True,
             ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
@@ -328,20 +345,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();
 }
 
@@ -356,6 +380,43 @@ 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)
+{
+    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
+
+
 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
 
 // ----------------------------------------------------------------------------
@@ -382,7 +443,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
@@ -413,6 +474,11 @@ 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)
 {
@@ -425,7 +491,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();
@@ -501,6 +567,11 @@ 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)
 {