Added ability to switch off more components of the size page UI

[wxWidgets.git] / src / generic / tipwin.cpp

diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp
index dfc01cff0d88fbf290807951018c188592f49e75..ede0ae3913d9ab9bdfb4652fcd18fd917c651000 100644 (file)
--- a/src/generic/tipwin.cpp
+++ b/src/generic/tipwin.cpp
@@ -167,7 +167,7 @@ wxTipWindow::~wxTipWindow()
     {
         *m_windowPtr = NULL;
     }
     {
         *m_windowPtr = NULL;
     }

-    #ifdef wxUSE_POPUPWIN
+    #if wxUSE_POPUPWIN

         #ifdef __WXGTK__
             if ( m_view->HasCapture() )
                 m_view->ReleaseMouse();
         #ifdef __WXGTK__
             if ( m_view->HasCapture() )
                 m_view->ReleaseMouse();


@@ -226,7 +226,11 @@ void wxTipWindow::Close()
         if ( m_view->HasCapture() )
             m_view->ReleaseMouse();
     #endif
         if ( m_view->HasCapture() )
             m_view->ReleaseMouse();
     #endif

-    Destroy();
+    // Under OS X we get destroyed because of wxEVT_KILL_FOCUS generated by
+    // Show(false).
+    #ifndef __WXOSX__
+        Destroy();
+    #endif

 #else
     wxFrame::Close();
 #endif
 #else
     wxFrame::Close();
 #endif