Make the gui test still run on the buildbot when the non-gui tests fail.

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

diff --git a/src/osx/nonownedwnd_osx.cpp b/src/osx/nonownedwnd_osx.cpp
index 017107215f22521e3e247c280e9dc01380018a69..a75e778ba84bc62f3bb3f098ddb6b4c107b40324 100644 (file)
--- a/src/osx/nonownedwnd_osx.cpp
+++ b/src/osx/nonownedwnd_osx.cpp
@@ -424,12 +424,7 @@ void wxNonOwnedWindow::DoGetClientSize( int *width, int *height ) const
         return;
 
     int left, top, w, h;
-    // perhaps we should do this for all ?
-#ifdef __WXOSX_IPHONE__
-    m_peer->GetContentArea(left, top, w, h);
-#else
     m_nowpeer->GetContentArea(left, top, w, h);
-#endif
     
     if (width)
        *width = w ;
@@ -458,6 +453,8 @@ bool wxNonOwnedWindow::DoSetShape(const wxRegion& region)
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,
                  wxT("Shaped windows must be created with the wxFRAME_SHAPED style."));
 
+    m_shape = region;
+    
     // The empty region signifies that the shape
     // should be removed from the window.
     if ( region.IsEmpty() )