X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e88e9846a39813e6a36a66e0a9cf09148d85a16..267ba369d605996cf6f9673aad528bfcf662f942:/src/osx/nonownedwnd_osx.cpp

diff --git a/src/osx/nonownedwnd_osx.cpp b/src/osx/nonownedwnd_osx.cpp
index e1c86794ca..7b8f08cedd 100644
--- a/src/osx/nonownedwnd_osx.cpp
+++ b/src/osx/nonownedwnd_osx.cpp
@@ -153,11 +153,11 @@ bool wxNonOwnedWindow::Create(wxWindow *parent,
 wxNonOwnedWindow::~wxNonOwnedWindow()
 {
     SendDestroyEvent();
-    
+
     wxRemoveWXWindowAssociation( this ) ;
-    
+
     DestroyChildren();
-    
+
     delete m_nowpeer;
 
     // avoid dangling refs
@@ -171,7 +171,7 @@ wxNonOwnedWindow::~wxNonOwnedWindow()
 
 bool wxNonOwnedWindow::ShowWithEffect(wxShowEffect effect,
                                 unsigned timeout )
-{ 
+{
     if ( !wxWindow::Show(true) )
         return false;
 
@@ -181,16 +181,16 @@ bool wxNonOwnedWindow::ShowWithEffect(wxShowEffect effect,
     HandleWindowEvent(event);
 
 
-    return m_nowpeer->ShowWithEffect(true, effect, timeout); 
+    return m_nowpeer->ShowWithEffect(true, effect, timeout);
 }
 
 bool wxNonOwnedWindow::HideWithEffect(wxShowEffect effect,
                                 unsigned timeout )
-{ 
+{
     if ( !wxWindow::Show(false) )
         return false;
 
-    return m_nowpeer->ShowWithEffect(false, effect, timeout); 
+    return m_nowpeer->ShowWithEffect(false, effect, timeout);
 }
 
 wxPoint wxNonOwnedWindow::GetClientAreaOrigin() const
@@ -201,17 +201,17 @@ wxPoint wxNonOwnedWindow::GetClientAreaOrigin() const
 }
 
 bool wxNonOwnedWindow::SetBackgroundColour(const wxColour& c )
-{        
+{
     if ( !wxWindow::SetBackgroundColour(c) && m_hasBgCol )
         return false ;
-    
+
     if ( GetBackgroundStyle() != wxBG_STYLE_CUSTOM )
     {
         if ( m_nowpeer )
             return m_nowpeer->SetBackgroundColour(c);
     }
     return true;
-}    
+}
 
 // Raise the window to the top of the Z order
 void wxNonOwnedWindow::Raise()
@@ -245,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 ;
 
@@ -306,7 +306,7 @@ bool wxNonOwnedWindow::Show(bool show)
 
     if ( m_nowpeer )
         m_nowpeer->Show(show);
-    
+
     if ( show )
     {
         // because apps expect a size event to occur at this moment
@@ -314,7 +314,7 @@ bool wxNonOwnedWindow::Show(bool show)
         event.SetEventObject(this);
         HandleWindowEvent(event);
     }
-    
+
     return true ;
 }
 
@@ -345,8 +345,8 @@ bool wxNonOwnedWindow::SetBackgroundStyle(wxBackgroundStyle style)
 {
     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)
@@ -378,9 +378,9 @@ void wxNonOwnedWindow::DoGetSize( int *width, int *height ) const
 {
     if ( m_nowpeer == NULL )
         return;
-        
+
     int w,h;
-    
+
     m_nowpeer->GetSize(w, h);
 
     if (width)
@@ -422,7 +422,7 @@ WXWindow wxNonOwnedWindow::GetWXWindow() const
 bool wxNonOwnedWindow::DoSetShape(const wxRegion& region)
 {
     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.