X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a45ff297987b57bbc5ad0f117a0bcd535b5ae425..254fbd140e67b60f46d7380c6ac242110ddd7585:/include/wx/mac/carbon/window.h?ds=sidebyside

diff --git a/include/wx/mac/carbon/window.h b/include/wx/mac/carbon/window.h
index 81643de6ff..e8ed1c6e1b 100644
--- a/include/wx/mac/carbon/window.h
+++ b/include/wx/mac/carbon/window.h
@@ -207,6 +207,7 @@ public:
     
     // return the rectangle that would be visible of this control, regardless whether controls are hidden
     // only taking into account clipping by parent windows
+    const wxRect&       MacGetClippedClientRect() const ;
     const wxRect&       MacGetClippedRect() const ;
     const wxRect&       MacGetClippedRectWithOuterStructure() const ;
     // returns the visible region of this control in window ie non-client coordinates
@@ -272,8 +273,10 @@ protected:
     mutable bool        m_cachedClippedRectValid ;
     mutable wxRect      m_cachedClippedRectWithOuterStructure ;
     mutable wxRect      m_cachedClippedRect ;
+    mutable wxRect      m_cachedClippedClientRect ;
     mutable wxRegion    m_cachedClippedRegionWithOuterStructure ;
     mutable wxRegion    m_cachedClippedRegion ;
+    mutable wxRegion    m_cachedClippedClientRegion ;
     // true if is is not a native control but a wxWindow control
 	bool				m_macIsUserPane ;
     wxBrush             m_macBackgroundBrush ;
@@ -290,6 +293,8 @@ protected:
     // it becomes the target window of a scrolled window it has to...
     bool                m_clipChildren ;
     
+    virtual bool        MacIsChildOfClientArea( const wxWindow* child ) const ;
+    
     void                MacCreateScrollBars( long style ) ;
     void                MacRepositionScrollBars() ;
     void                MacUpdateControlFont() ;