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

Use DoIsExposed for the virtual version of the method, so the wxPoint

Browse Source 
and wxRect versions don't get hidden in derived classes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-09-11 17:50:12 +00:00
parent 6517912d80
commit 657b4fd417
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/gtk/window.h
View File

@@ -119,8 +119,8 @@ public:
wxCoord width, wxCoord width,
wxCoord widthTotal) const; wxCoord widthTotal) const;
virtual bool IsExposed( int x, int y ) const; virtual bool DoIsExposed( int x, int y ) const;
virtual bool IsExposed( int x, int y, int w, int h ) const; virtual bool DoIsExposed( int x, int y, int w, int h ) const;
// currently wxGTK2-only // currently wxGTK2-only
void SetDoubleBuffered(bool on); void SetDoubleBuffered(bool on);

12
include/wx/window.h
View File

@@ -728,13 +728,17 @@ public:
// these functions verify whether the given point/rectangle belongs to // these functions verify whether the given point/rectangle belongs to
// (or at least intersects with) the update region // (or at least intersects with) the update region
virtual bool IsExposed( int x, int y ) const; virtual bool DoIsExposed( int x, int y ) const;
virtual bool IsExposed( int x, int y, int w, int h ) const; virtual bool DoIsExposed( int x, int y, int w, int h ) const;
bool IsExposed( int x, int y ) const
{ return DoIsExposed(x, y); }
bool IsExposed( int x, int y, int w, int h ) const
{ return DoIsExposed(x, y, w, h); }
bool IsExposed( const wxPoint& pt ) const bool IsExposed( const wxPoint& pt ) const
{ return IsExposed(pt.x, pt.y); } { return DoIsExposed(pt.x, pt.y); }
bool IsExposed( const wxRect& rect ) const bool IsExposed( const wxRect& rect ) const
{ return IsExposed(rect.x, rect.y, rect.width, rect.height); } { return DoIsExposed(rect.x, rect.y, rect.width, rect.height); }
// colours, fonts and cursors // colours, fonts and cursors
// -------------------------- // --------------------------

4
src/common/wincmn.cpp
View File

@@ -1146,12 +1146,12 @@ wxRect wxWindowBase::GetUpdateClientRect() const
return rectUpdate; return rectUpdate;
} }
bool wxWindowBase::IsExposed(int x, int y) const bool wxWindowBase::DoIsExposed(int x, int y) const
{ {
return m_updateRegion.Contains(x, y) != wxOutRegion; return m_updateRegion.Contains(x, y) != wxOutRegion;
} }
bool wxWindowBase::IsExposed(int x, int y, int w, int h) const bool wxWindowBase::DoIsExposed(int x, int y, int w, int h) const
{ {
return m_updateRegion.Contains(x, y, w, h) != wxOutRegion; return m_updateRegion.Contains(x, y, w, h) != wxOutRegion;
} }

4
src/gtk/window.cpp
View File

@@ -3783,13 +3783,13 @@ void wxWindowGTK::GtkUpdate()
} }
} }
bool wxWindowGTK::IsExposed( int x, int y ) const bool wxWindowGTK::DoIsExposed( int x, int y ) const
{ {
return m_updateRegion.Contains(x, y) != wxOutRegion; return m_updateRegion.Contains(x, y) != wxOutRegion;
} }
bool wxWindowGTK::IsExposed( int x, int y, int w, int h ) const bool wxWindowGTK::DoIsExposed( int x, int y, int w, int h ) const
{ {
if (GetLayoutDirection() == wxLayout_RightToLeft) if (GetLayoutDirection() == wxLayout_RightToLeft)
return m_updateRegion.Contains(x-w, y, w, h) != wxOutRegion; return m_updateRegion.Contains(x-w, y, w, h) != wxOutRegion;