From 8e88e9846a39813e6a36a66e0a9cf09148d85a16 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 13 Mar 2009 18:43:46 +0000 Subject: [PATCH] solving inversion problem, because SetShape is redefined on toplevel.h level git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/nonownedwnd.h | 4 ++-- include/wx/osx/toplevel.h | 3 +++ src/osx/nonownedwnd_osx.cpp | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/wx/osx/nonownedwnd.h b/include/wx/osx/nonownedwnd.h index 3ce7ae952c..61caeb7d00 100644 --- a/include/wx/osx/nonownedwnd.h +++ b/include/wx/osx/nonownedwnd.h @@ -61,8 +61,6 @@ public: // implement base class pure virtuals - virtual bool SetShape(const wxRegion& region); - virtual bool SetTransparent(wxByte alpha); virtual bool CanSetTransparent(); @@ -76,6 +74,8 @@ public: // implementation from now on // -------------------------- + virtual bool DoSetShape(const wxRegion& region); + // activation hooks only necessary for MDI Implementation static void MacDelayedDeactivation(long timestamp); virtual void MacActivate( long timestamp , bool inIsActivating ) ; diff --git a/include/wx/osx/toplevel.h b/include/wx/osx/toplevel.h index 7983b8c5c6..f544bf99de 100644 --- a/include/wx/osx/toplevel.h +++ b/include/wx/osx/toplevel.h @@ -49,6 +49,9 @@ public: virtual wxPoint GetClientAreaOrigin() const; + virtual bool SetShape(const wxRegion& region) + { return DoSetShape(region); } + // Attracts the users attention to this window if the application is // inactive (should be called when a background event occurs) virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); diff --git a/src/osx/nonownedwnd_osx.cpp b/src/osx/nonownedwnd_osx.cpp index 39d569c003..e1c86794ca 100644 --- a/src/osx/nonownedwnd_osx.cpp +++ b/src/osx/nonownedwnd_osx.cpp @@ -419,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.")); @@ -433,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); -- 2.47.2