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

diff --git a/include/wx/osx/nonownedwnd.h b/include/wx/osx/nonownedwnd.h
index 3ce7ae952c7a023cf79c88272c87c0bb98c105d8..61caeb7d0074444f3eb652d761baa2717c6fb07c 100644 (file)
--- a/include/wx/osx/nonownedwnd.h
+++ b/include/wx/osx/nonownedwnd.h
@@ -61,8 +61,6 @@ public:
 
     // implement base class pure virtuals
 
 
     // implement base class pure virtuals
 

-    virtual bool SetShape(const wxRegion& region);
-

     virtual bool SetTransparent(wxByte alpha);
     virtual bool CanSetTransparent();
 
     virtual bool SetTransparent(wxByte alpha);
     virtual bool CanSetTransparent();
 


@@ -76,6 +74,8 @@ public:
     // implementation from now on
     // --------------------------
 
     // 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 ) ;
     // 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 7983b8c5c6adb1b03df4aee496ae3ce2be10aa38..f544bf99def01ce3c220775a7c104349e839e75c 100644 (file)
--- a/include/wx/osx/toplevel.h
+++ b/include/wx/osx/toplevel.h
@@ -49,6 +49,9 @@ public:
 
     virtual wxPoint GetClientAreaOrigin() const;
 
 
     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);
     // 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 39d569c003d974750d429303fd44522c6ac1ec5d..e1c86794ca03f1f402984496b84cab5490f00cab 100644 (file)
--- 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."));
 {
     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
         if ( rgn.IsEmpty() )
             return false ;
         else

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

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