clipping for wxMac cleaned up

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/laywin.h b/include/wx/generic/laywin.h
index 0f8ede2e8d9885448780bd54bdb89c7b88165e37..ef1c162d9fec39ea471c9d30edc89e5687d58a7a 100644 (file)
--- a/include/wx/generic/laywin.h
+++ b/include/wx/generic/laywin.h
@@ -184,6 +184,10 @@ public:
     // Called by layout algorithm to retrieve information about the window.
     void OnQueryLayoutInfo(wxQueryLayoutInfoEvent& event);
 
+#ifdef __WXMAC__
+    virtual bool MacClipChildren() const { return true ; }
+#endif
+
 private:
     void Init();
 

diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h
index fc55e3177b63e5b1f3b5e31ceb101449b6300a49..88ef181e6b03a201acfedef9c89191bc2f2b37c2 100644 (file)
--- a/include/wx/generic/scrolwin.h
+++ b/include/wx/generic/scrolwin.h
@@ -71,6 +71,9 @@ public:
 
     virtual void DoSetVirtualSize(int x, int y);
 
+#ifdef __WXMAC__
+       virtual bool MacClipChildren() const { return true ; }
+#endif
 protected:
     // this is needed for wxEVT_PAINT processing hack described in
     // wxScrollHelperEvtHandler::ProcessEvent()

diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h
index 2102a1bb51cbbd99ed2dcec9f7f6a336a3ccb5fa..f53efc311a380bcb59804662146618a174b71ad2 100644 (file)
--- a/include/wx/generic/splitter.h
+++ b/include/wx/generic/splitter.h
@@ -212,6 +212,9 @@ public:
     void SetNeedUpdating(bool needUpdating) { m_needUpdating = needUpdating; }
     bool GetNeedUpdating() const { return m_needUpdating ; }
 
+#ifdef __WXMAC__
+       virtual bool MacClipGrandChildren() const { return true ; }
+#endif
 protected:
     // event handlers
 #if defined(__WXMSW__) || defined(__WXMAC__)

diff --git a/include/wx/mac/carbon/window.h b/include/wx/mac/carbon/window.h
index 01b5e495d4934bbd2c9e48d5c9fd6d7f1347df02..5d4f8ccd5694d4742c04c67925807b92e164a2e9 100644 (file)
--- a/include/wx/mac/carbon/window.h
+++ b/include/wx/mac/carbon/window.h
@@ -201,6 +201,11 @@ public:
     // returns the visible region of this control in window ie non-client coordinates
     
     wxRegion            MacGetVisibleRegion( bool includeOuterStructures = false ) ;
+    // returns true if children have to clipped to the content area (eg scrolled window)
+    virtual bool               MacClipChildren() const { return false ; }
+    // returns true if the grandchildren have to be clipped to the children's content area (eg
+    // splitter window)
+    virtual bool               MacClipGrandChildren() const { return false ; }
     bool                MacIsWindowScrollbar( const wxScrollBar* sb )
         { return (m_hScrollBar == sb || m_vScrollBar == sb) ; }