[1231183] 'cleanup: mismatched indentation' and other cleanings.

[wxWidgets.git] / include / wx / mac / carbon / window.h

diff --git a/include/wx/mac/carbon/window.h b/include/wx/mac/carbon/window.h
index 81643de6ff909c3b29af9ca71482a9d487b6b64f..225604e44533c1f008fdfa4e8878b0c0e7a9e5ff 100644 (file)
--- a/include/wx/mac/carbon/window.h
+++ b/include/wx/mac/carbon/window.h
@@ -109,6 +109,7 @@ public:
     virtual int GetScrollRange( int orient ) const;
     virtual void ScrollWindow( int dx, int dy,
                                const wxRect* rect = (wxRect *) NULL );
+    virtual bool Reparent( wxWindowBase *newParent );
 
 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget( wxDropTarget *dropTarget );
@@ -207,6 +208,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 +274,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 +294,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() ;