wxSplitterWindow mouse capture improvements and cleanup.

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

diff --git a/src/osx/nonownedwnd_osx.cpp b/src/osx/nonownedwnd_osx.cpp
index 39d569c003d974750d429303fd44522c6ac1ec5d..c2f36dd487b409e6d6aeeda64cf1bd11b2b9f704 100644 (file)
--- a/src/osx/nonownedwnd_osx.cpp
+++ b/src/osx/nonownedwnd_osx.cpp
@@ -245,7 +245,7 @@ void wxNonOwnedWindow::HandleResized( double timestampsec )
     wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
 }
 
     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 ;
 
 {
     wxRect r = *rect ;
 


@@ -346,7 +346,7 @@ bool wxNonOwnedWindow::SetBackgroundStyle(wxBackgroundStyle style)
     if ( !wxWindow::SetBackgroundStyle(style) )
         return false ;
         
     if ( !wxWindow::SetBackgroundStyle(style) )
         return false ;
         

-    return m_nowpeer->SetBackgroundStyle(style);
+    return m_nowpeer ? m_nowpeer->SetBackgroundStyle(style) : true;

 }
 
 void wxNonOwnedWindow::DoMoveWindow(int x, int y, int width, int height)
 }
 
 void wxNonOwnedWindow::DoMoveWindow(int x, int y, int width, int height)


@@ -419,10 +419,10 @@ WXWindow wxNonOwnedWindow::GetWXWindow() const
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 
 

-bool wxNonOwnedWindow::SetShape(const wxRegion& region)
+bool wxNonOwnedWindow::DoSetShape(const wxRegion& region)

 {
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,
 {
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,

-                 _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
+                 wxT("Shaped windows must be created with the wxFRAME_SHAPED style."));

 
     // The empty region signifies that the shape
     // should be removed from the window.
 
     // The empty region signifies that the shape
     // should be removed from the window.


@@ -433,7 +433,7 @@ bool wxNonOwnedWindow::SetShape(const wxRegion& region)
         if ( rgn.IsEmpty() )
             return false ;
         else
         if ( rgn.IsEmpty() )
             return false ;
         else

-            return SetShape(rgn);
+            return DoSetShape(rgn);

     }
 
     return m_nowpeer->SetShape(region);
     }
 
     return m_nowpeer->SetShape(region);