X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/80332672ab36153aa2424cff2a06b434287488c8..d350fbec220fb134b9bf82a7e442d0accd4f95c1:/include/wx/containr.h diff --git a/include/wx/containr.h b/include/wx/containr.h index e44b507a33..87ab324a28 100644 --- a/include/wx/containr.h +++ b/include/wx/containr.h @@ -15,6 +15,9 @@ #include "wx/defs.h" +class WXDLLIMPEXP_FWD_CORE wxWindow; +class WXDLLIMPEXP_FWD_CORE wxWindowBase; + /* Implementation note: wxControlContainer is not a real mix-in but rather a class meant to be aggregated with (and not inherited from). Although @@ -39,7 +42,10 @@ public: // do accept focus initially, we'll stop doing it if/when any children // are added m_acceptsFocus = true; + m_inSetFocus = false; + m_winLastFocused = NULL; } + virtual ~wxControlContainerBase() {} void SetContainerWindow(wxWindow *winParent) { @@ -48,26 +54,47 @@ public: m_winParent = winParent; } + // should be called from SetFocus(), returns false if we did nothing with + // the focus and the default processing should take place + bool DoSetFocus(); + // should be called when we decide that we should [stop] accepting focus void SetCanFocus(bool acceptsFocus); // returns whether we should accept focus ourselves or not bool AcceptsFocus() const { return m_acceptsFocus; } - // call this when the number of children of the window changes - void UpdateCanFocus() { SetCanFocus(ShouldAcceptFocus()); } + // returns whether we or one of our children accepts focus: we always do + // because if we don't have any focusable children it probably means that + // we're not being used as a container at all (think of wxGrid or generic + // wxListCtrl) and so should get focus for ourselves + bool AcceptsFocusRecursively() const { return true; } + + // Call this when the number of children of the window changes. + // If we have any children, this panel (used just as container for + // them) shouldn't get focus for itself. + void UpdateCanFocus() { SetCanFocus(!HasAnyFocusableChildren()); } protected: - // return true if we should be focusable - bool ShouldAcceptFocus() const; + // set the focus to the child which had it the last time + virtual bool SetFocusToChild(); + + // return true if we have any children accepting focus + bool HasAnyFocusableChildren() const; -private: // the parent window we manage the children for wxWindow *m_winParent; + // the child which had the focus last time this panel was activated + wxWindow *m_winLastFocused; + +private: // value returned by AcceptsFocus(), should be changed using SetCanFocus() // only bool m_acceptsFocus; + + // a guard against infinite recursion + bool m_inSetFocus; }; // common part of WX_DECLARE_CONTROL_CONTAINER in the native and generic cases, @@ -75,8 +102,10 @@ private: #define WX_DECLARE_CONTROL_CONTAINER_BASE() \ public: \ virtual bool AcceptsFocus() const; \ + virtual bool AcceptsFocusRecursively() const; \ virtual void AddChild(wxWindowBase *child); \ virtual void RemoveChild(wxWindowBase *child); \ + virtual void SetFocus(); \ void SetFocusIgnoringChildren(); \ void AcceptFocus(bool acceptFocus) \ { \ @@ -100,6 +129,17 @@ protected: \ m_container.UpdateCanFocus(); \ } \ \ + bool classname::AcceptsFocusRecursively() const \ + { \ + return m_container.AcceptsFocusRecursively(); \ + } \ + \ + void classname::SetFocus() \ + { \ + if ( !m_container.DoSetFocus() ) \ + basename::SetFocus(); \ + } \ + \ bool classname::AcceptsFocus() const \ { \ return m_container.AcceptsFocus(); \ @@ -115,6 +155,9 @@ protected: \ // this must be a real class as we forward-declare it elsewhere class WXDLLEXPORT wxControlContainer : public wxControlContainerBase { +protected: + // set the focus to the child which had it the last time + virtual bool SetFocusToChild(); }; #define WX_EVENT_TABLE_CONTROL_CONTAINER(classname) @@ -133,15 +176,13 @@ class WXDLLEXPORT wxControlContainer : public wxControlContainerBase \ void classname::SetFocusIgnoringChildren() \ { \ - SetFocus(); \ + basename::SetFocus(); \ } #else // !wxHAS_NATIVE_TAB_TRAVERSAL -class WXDLLEXPORT wxFocusEvent; -class WXDLLEXPORT wxNavigationKeyEvent; -class WXDLLEXPORT wxWindow; -class WXDLLEXPORT wxWindowBase; +class WXDLLIMPEXP_FWD_CORE wxFocusEvent; +class WXDLLIMPEXP_FWD_CORE wxNavigationKeyEvent; // ---------------------------------------------------------------------------- // wxControlContainer for TAB navigation implemented in wx itself @@ -158,51 +199,28 @@ public: void HandleOnFocus(wxFocusEvent& event); void HandleOnWindowDestroy(wxWindowBase *child); - // should be called from SetFocus(), returns false if we did nothing with - // the focus and the default processing should take place - bool DoSetFocus(); - - // can our child get the focus? - bool AcceptsFocus() const; - // called from OnChildFocus() handler, i.e. when one of our (grand) // children gets the focus void SetLastFocus(wxWindow *win); protected: - // set the focus to the child which had it the last time - bool SetFocusToChild(); - - // the child which had the focus last time this panel was activated - wxWindow *m_winLastFocused; - - // a guard against infinite recursion - bool m_inSetFocus; DECLARE_NO_COPY_CLASS(wxControlContainer) }; -// this function is for wxWidgets internal use only -extern bool wxSetFocusToChild(wxWindow *win, wxWindow **child); - // ---------------------------------------------------------------------------- // macros which may be used by the classes wishing to implement TAB navigation // among their children // ---------------------------------------------------------------------------- // declare the methods to be forwarded -#define WX_DECLARE_CONTROL_CONTAINER() \ -public: \ - void OnNavigationKey(wxNavigationKeyEvent& event); \ - void OnFocus(wxFocusEvent& event); \ - void SetFocusIgnoringChildren(); \ - virtual void OnChildFocus(wxChildFocusEvent& event); \ - virtual void SetFocus(); \ - virtual void RemoveChild(wxWindowBase *child); \ - virtual bool AcceptsFocus() const; \ -\ -protected: \ - wxControlContainer m_container +#define WX_DECLARE_CONTROL_CONTAINER() \ + WX_DECLARE_CONTROL_CONTAINER_BASE(); \ + \ +public: \ + void OnNavigationKey(wxNavigationKeyEvent& event); \ + void OnFocus(wxFocusEvent& event); \ + virtual void OnChildFocus(wxChildFocusEvent& event) // implement the event table entries for wxControlContainer #define WX_EVENT_TABLE_CONTROL_CONTAINER(classname) \ @@ -228,12 +246,6 @@ protected: \ m_container.HandleOnNavigationKey(event); \ } \ \ - void classname::SetFocus() \ - { \ - if ( !m_container.DoSetFocus() ) \ - basename::SetFocus(); \ - } \ - \ void classname::SetFocusIgnoringChildren() \ { \ basename::SetFocus(); \ @@ -247,8 +259,11 @@ protected: \ void classname::OnFocus(wxFocusEvent& event) \ { \ m_container.HandleOnFocus(event); \ - } + } #endif // wxHAS_NATIVE_TAB_TRAVERSAL/!wxHAS_NATIVE_TAB_TRAVERSAL +// this function is for wxWidgets internal use only +extern bool wxSetFocusToChild(wxWindow *win, wxWindow **child); + #endif // _WX_CONTAINR_H_