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

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

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index e21599eca3963be3ad36a3dcb9817d2d9610416f..c009ff693a39a9d89b8817ce428644843c2775e1 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -119,8 +119,8 @@ public:
                                              wxCoord width,
                                              wxCoord widthTotal) const;
 
-    virtual bool IsExposed( int x, int y ) const;
-    virtual bool IsExposed( int x, int y, int w, int h ) const;
+    virtual bool DoIsExposed( int x, int y ) const;
+    virtual bool DoIsExposed( int x, int y, int w, int h ) const;
 
     // currently wxGTK2-only
     void SetDoubleBuffered(bool on);

diff --git a/include/wx/window.h b/include/wx/window.h
index 00270cee4a934e0fbd1bf5293ddeded7ac40ee44..c7183ecabb746ca4f3aa248dec3a717f89fc407b 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -728,13 +728,17 @@ public:
 
         // these functions verify whether the given point/rectangle belongs to
         // (or at least intersects with) the update region
-    virtual bool IsExposed( int x, int y ) const;
-    virtual bool IsExposed( int x, int y, int w, int h ) const;
+    virtual bool DoIsExposed( int x, int y ) 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
-        { return IsExposed(pt.x, pt.y); }
+        { return DoIsExposed(pt.x, pt.y); }
     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
     // --------------------------

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 08acc6455611c39795706be6284c33bf42e550cb..9d0b6f45822f2f2e8f49f91cdec5a2e47c9ab8c1 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -1146,12 +1146,12 @@ wxRect wxWindowBase::GetUpdateClientRect() const
     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;
 }
 
-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;
 }

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 7f7721e327cea0d13379a1ed1906c505644109d5..583b46987799019d7767c99e7f7928cb354a24d0 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -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;
 }
 
 
-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)
         return m_updateRegion.Contains(x-w, y, w, h) != wxOutRegion;