AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adding protected inquiry function whether a child window belongs to the 'client' or the 'non-client' area, examples for the latter are toolbar, scrollbars etc

Browse Source 
adding another cached clip rect for the real client area


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2005-04-01 07:05:52 +00:00
parent 914955aaa0
commit 78df41df75
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/mac/carbon/frame.h
View File

@ -111,6 +111,8 @@ protected:
// the last focused child: we restore focus to it on activation // the last focused child: we restore focus to it on activation
wxWindow *m_winLastFocused; wxWindow *m_winLastFocused;
virtual bool MacIsChildOfClientArea( const wxWindow* child ) const ;
private: private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxFrame) DECLARE_DYNAMIC_CLASS(wxFrame)

5
include/wx/mac/carbon/window.h
View File

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