implement new wxBG_STYLE_XXX semantics for wxMSW too

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

diff --git a/src/osx/nonownedwnd_osx.cpp b/src/osx/nonownedwnd_osx.cpp
index 2a6f1cf0057a0404f444138f12e405ec4a14d3e0..674c4d9968633dc3f8878df17a73b025b15cb40c 100644 (file)
--- a/src/osx/nonownedwnd_osx.cpp
+++ b/src/osx/nonownedwnd_osx.cpp
@@ -13,6 +13,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/log.h"

 #endif // WX_PRECOMP
 
 #include "wx/hashmap.h"
 #endif // WX_PRECOMP
 
 #include "wx/hashmap.h"


@@ -244,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 ;
 


@@ -345,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)


@@ -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."));
 {
     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
         if ( rgn.IsEmpty() )
             return false ;
         else

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

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