Permission for flood-fill code clarified

[wxWidgets.git] / src / common / popupcmn.cpp

diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index b4803861243fb4681b7c5d5074022e7a49af5fbb..150f81a92cba619d089a8bec466e1d75e8aaa8ab 100644 (file)
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -289,9 +289,10 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus)
     m_child->Connect(wxEVT_DESTROY,
                      wxWindowDestroyEventHandler(wxPopupTransientWindow::OnDestroy),
                      NULL, this);
-    m_focus->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 )
@@ -404,7 +405,7 @@ void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
     if (IsShown() && m_child)
     {
         wxPoint pos = ScreenToClient(wxGetMousePosition());
-        wxRect rect(wxPoint(0,0), GetSize());
+        wxRect rect(GetSize());
 
         if ( rect.Inside(pos) )
         {