Fix crash in wxDC::GetMultiLineTextExtent() after last commit.

[wxWidgets.git] / src / osx / carbon / popupwin.cpp

diff --git a/src/osx/carbon/popupwin.cpp b/src/osx/carbon/popupwin.cpp
index 299d90386241e5b545086f293170255a2cbbac59..5f7369137141705216f55d92a46a1a3058a26199 100644 (file)
--- a/src/osx/carbon/popupwin.cpp
+++ b/src/osx/carbon/popupwin.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        src/osx/popupwin.cpp
+// Name:        src/osx/carbon/popupwin.cpp
 // Purpose:     implements wxPopupWindow for wxMac
 // Author:      Stefan Csomor
 // Modified by:
-// Created:     
+// Created:
 // RCS-ID:      $Id$
 // Copyright:   (c) 2006 Stefan Csomor
-// License:     wxWindows licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -34,7 +34,7 @@
 #include "wx/popupwin.h"
 #include "wx/tooltip.h"
 
-#include "wx/osx/private.h"    
+#include "wx/osx/private.h"
 
 // ============================================================================
 // implementation
@@ -56,4 +56,25 @@ bool wxPopupWindow::Create(wxWindow *parent, int flags)
 
 }
 
+bool wxPopupWindow::Show(bool show)
+{
+    if ( !wxWindow::Show(show) )
+        return false;
+
+    if ( m_nowpeer && show)
+        m_nowpeer->ShowWithoutActivating();
+    else if ( m_nowpeer )
+        m_nowpeer->Show(false);
+
+    if ( show )
+    {
+        // because apps expect a size event to occur at this moment
+        wxSizeEvent event(GetSize() , m_windowId);
+        event.SetEventObject(this);
+        HandleWindowEvent(event);
+    }
+
+    return true;
+}
+
 #endif // #if wxUSE_POPUPWIN