Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

solving inversion problem, because SetShape is redefined on toplevel.h level

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-03-13 18:43:46 +00:00
parent b99c746cad
commit 8e88e9846a
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/osx/nonownedwnd.h
View File

@@ -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 SetTransparent(wxByte alpha);
virtual bool CanSetTransparent(); 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 // activation hooks only necessary for MDI Implementation
static void MacDelayedDeactivation(long timestamp); static void MacDelayedDeactivation(long timestamp);
virtual void MacActivate( long timestamp , bool inIsActivating ) ; virtual void MacActivate( long timestamp , bool inIsActivating ) ;

3
include/wx/osx/toplevel.h
View File

@@ -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 // Attracts the users attention to this window if the application is
// inactive (should be called when a background event occurs) // inactive (should be called when a background event occurs)
virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);

4
src/osx/nonownedwnd_osx.cpp
View File

@@ -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, wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,
_T("Shaped windows must be created with the wxFRAME_SHAPED style.")); _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
@@ -433,7 +433,7 @@ bool wxNonOwnedWindow::SetShape(const wxRegion& region)
if ( rgn.IsEmpty() ) if ( rgn.IsEmpty() )
return false ; return false ;
else else
return SetShape(rgn); return DoSetShape(rgn);
} }
return m_nowpeer->SetShape(region); return m_nowpeer->SetShape(region);