X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b8afff01ccdc8b71407caa2c9c09c8196ffbf5e3..421bb0184e589b470c7196940f9d5ed4f3d08136:/src/osx/nonownedwnd_osx.cpp

diff --git a/src/osx/nonownedwnd_osx.cpp b/src/osx/nonownedwnd_osx.cpp
index d8b9e02ce7..ed53785787 100644
--- a/src/osx/nonownedwnd_osx.cpp
+++ b/src/osx/nonownedwnd_osx.cpp
@@ -13,6 +13,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/log.h"
 #endif // WX_PRECOMP
 
 #include "wx/hashmap.h"
@@ -151,7 +152,7 @@ bool wxNonOwnedWindow::Create(wxWindow *parent,
 
 wxNonOwnedWindow::~wxNonOwnedWindow()
 {
-    m_isBeingDeleted = true;
+    SendDestroyEvent();
     
     wxRemoveWXWindowAssociation( this ) ;
     
@@ -244,7 +245,7 @@ void wxNonOwnedWindow::HandleResized( double timestampsec )
     wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
 }
 
-void wxNonOwnedWindow::HandleResizing( double timestampsec, wxRect* rect )
+void wxNonOwnedWindow::HandleResizing( double WXUNUSED(timestampsec), wxRect* rect )
 {
     wxRect r = *rect ;
 
@@ -418,7 +419,7 @@ WXWindow wxNonOwnedWindow::GetWXWindow() const
 // ---------------------------------------------------------------------------
 
 
-bool wxNonOwnedWindow::SetShape(const wxRegion& region)
+bool wxNonOwnedWindow::DoSetShape(const wxRegion& region)
 {
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,
                  _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
@@ -432,7 +433,7 @@ bool wxNonOwnedWindow::SetShape(const wxRegion& region)
         if ( rgn.IsEmpty() )
             return false ;
         else
-            return SetShape(rgn);
+            return DoSetShape(rgn);
     }
 
     return m_nowpeer->SetShape(region);