Fix compilation of wxOSX event loop without wxUSE_EVENTLOOP_SOURCE.

[wxWidgets.git] / src / osx / toplevel_osx.cpp

diff --git a/src/osx/toplevel_osx.cpp b/src/osx/toplevel_osx.cpp
index b96d3a0eccf4ae6a6ba3a610a88163e29276df30..f92665932ea44b03ed34c598bf93195349accfc8 100644 (file)
--- a/src/osx/toplevel_osx.cpp
+++ b/src/osx/toplevel_osx.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        src/osx/toplevel.cpp
+// Name:        src/osx/toplevel_osx.cpp

 // Purpose:     implements wxTopLevelWindow for Mac
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     implements wxTopLevelWindow for Mac
 // Author:      Stefan Csomor
 // Modified by:


@@ -88,9 +88,9 @@ bool wxTopLevelWindowMac::Create(wxWindow *parent,
 {
     if ( !wxNonOwnedWindow::Create(parent, nativeWindow ) )
         return false;
 {
     if ( !wxNonOwnedWindow::Create(parent, nativeWindow ) )
         return false;

-    
+

     wxTopLevelWindows.Append(this);
     wxTopLevelWindows.Append(this);

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -106,7 +106,13 @@ bool wxTopLevelWindowMac::Destroy()
     if (m_nowpeer && m_nowpeer->GetWXWindow())
         ClearKeyboardFocus( (WindowRef)m_nowpeer->GetWXWindow() );
 #endif
     if (m_nowpeer && m_nowpeer->GetWXWindow())
         ClearKeyboardFocus( (WindowRef)m_nowpeer->GetWXWindow() );
 #endif

-    return wxTopLevelWindowBase::Destroy();
+    // delayed destruction: the tlw will be deleted during the next idle
+    // loop iteration
+    if ( !wxPendingDelete.Member(this) )
+        wxPendingDelete.Append(this);
+    
+    Hide();
+    return true;

 }
 
 
 }
 
 


@@ -124,7 +130,7 @@ bool wxTopLevelWindowMac::IsMaximized() const
 {
     if ( m_nowpeer == NULL )
         return false;
 {
     if ( m_nowpeer == NULL )
         return false;

-    
+

     return m_nowpeer->IsMaximized();
 }
 
     return m_nowpeer->IsMaximized();
 }
 


@@ -180,7 +186,7 @@ void wxTopLevelWindowMac::ShowWithoutActivating()
         return;
 
     m_nowpeer->ShowWithoutActivating();
         return;
 
     m_nowpeer->ShowWithoutActivating();

-    
+

     // TODO: Should we call EVT_SIZE here?
 }
 
     // TODO: Should we call EVT_SIZE here?
 }
 


@@ -213,3 +219,8 @@ bool wxTopLevelWindowMac::OSXIsModified() const
 {
     return m_nowpeer->IsModified();
 }
 {
     return m_nowpeer->IsModified();
 }

+
+void wxTopLevelWindowMac::SetRepresentedFilename(const wxString& filename)
+{
+    m_nowpeer->SetRepresentedFilename(filename);
+}