X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6285be722384e07c2587e769dce7cabb8adbd31b..395367bcd303ad3b8fbf7d4f523f62d72ec7fa55:/include/wx/containr.h?ds=sidebyside diff --git a/include/wx/containr.h b/include/wx/containr.h index 456c8354d3..375caff127 100644 --- a/include/wx/containr.h +++ b/include/wx/containr.h @@ -13,18 +13,14 @@ #ifndef _WX_CONTAINR_H_ #define _WX_CONTAINR_H_ -#ifdef __GNUG__ - #pragma interface "containr.h" -#endif +#include "wx/defs.h" -class WXDLLEXPORT wxFocusEvent; -class WXDLLEXPORT wxNavigationKeyEvent; class WXDLLEXPORT wxWindow; class WXDLLEXPORT wxWindowBase; /* Implementation note: wxControlContainer is not a real mix-in but rather - a class meant to be agregated with (and not inherited from). Although + a class meant to be aggregated with (and not inherited from). Although logically it should be a mix-in, doing it like this has no advantage from the point of view of the existing code but does have some problems (we'd need to play tricks with event handlers which may be difficult to do @@ -32,44 +28,159 @@ class WXDLLEXPORT wxWindowBase; */ // ---------------------------------------------------------------------------- -// wxControlContainer +// wxControlContainerBase: common part used in both native and generic cases // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxControlContainer +class WXDLLEXPORT wxControlContainerBase { public: - // ctors and such - wxControlContainer(wxWindow *winParent); + // default ctor, SetContainerWindow() must be called later + wxControlContainerBase() + { + m_winParent = NULL; - wxWindow *GetDefaultItem() const { return m_winDefault; } - wxWindow *SetDefaultItem(wxWindow *win) - { wxWindow *winOld = m_winDefault; m_winDefault = win; return winOld; } + // do accept focus initially, we'll stop doing it if/when any children + // are added + m_acceptsFocus = true; + } - void SetLastFocus(wxWindow *win); + void SetContainerWindow(wxWindow *winParent) + { + wxASSERT_MSG( !m_winParent, _T("shouldn't be called twice") ); + + m_winParent = winParent; + } + + // 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()); } + +protected: + // return true if we should be focusable + bool ShouldAcceptFocus() const; + + // the parent window we manage the children for + wxWindow *m_winParent; + +private: + // value returned by AcceptsFocus(), should be changed using SetCanFocus() + // only + bool m_acceptsFocus; +}; + +// common part of WX_DECLARE_CONTROL_CONTAINER in the native and generic cases, +// it should be used in the wxWindow-derived class declaration +#define WX_DECLARE_CONTROL_CONTAINER_BASE() \ +public: \ + virtual bool AcceptsFocus() const; \ + virtual void AddChild(wxWindowBase *child); \ + virtual void RemoveChild(wxWindowBase *child); \ + void SetFocusIgnoringChildren(); \ + void AcceptFocus(bool acceptFocus) \ + { \ + m_container.SetCanFocus(acceptFocus); \ + } \ + \ +protected: \ + wxControlContainer m_container + +// this macro must be used in the derived class ctor +#define WX_INIT_CONTROL_CONTAINER() \ + m_container.SetContainerWindow(this) + +// common part of WX_DELEGATE_TO_CONTROL_CONTAINER in the native and generic +// cases, must be used in the wxWindow-derived class implementation +#define WX_DELEGATE_TO_CONTROL_CONTAINER_BASE(classname, basename) \ + void classname::AddChild(wxWindowBase *child) \ + { \ + basename::AddChild(child); \ + \ + m_container.UpdateCanFocus(); \ + } \ + \ + bool classname::AcceptsFocus() const \ + { \ + return m_container.AcceptsFocus(); \ + } + + +#ifdef wxHAS_NATIVE_TAB_TRAVERSAL + +// ---------------------------------------------------------------------------- +// wxControlContainer for native TAB navigation +// ---------------------------------------------------------------------------- + +// this must be a real class as we forward-declare it elsewhere +class WXDLLEXPORT wxControlContainer : public wxControlContainerBase +{ +}; + +#define WX_EVENT_TABLE_CONTROL_CONTAINER(classname) + +#define WX_DECLARE_CONTROL_CONTAINER WX_DECLARE_CONTROL_CONTAINER_BASE + +#define WX_DELEGATE_TO_CONTROL_CONTAINER(classname, basename) \ + WX_DELEGATE_TO_CONTROL_CONTAINER_BASE(classname, basename) \ + \ + void classname::RemoveChild(wxWindowBase *child) \ + { \ + basename::RemoveChild(child); \ + \ + m_container.UpdateCanFocus(); \ + } \ + \ + void classname::SetFocusIgnoringChildren() \ + { \ + SetFocus(); \ + } + +#else // !wxHAS_NATIVE_TAB_TRAVERSAL + +class WXDLLEXPORT wxFocusEvent; +class WXDLLEXPORT wxNavigationKeyEvent; + +// ---------------------------------------------------------------------------- +// wxControlContainer for TAB navigation implemented in wx itself +// ---------------------------------------------------------------------------- + +class WXDLLEXPORT wxControlContainer : public wxControlContainerBase +{ +public: + // default ctor, SetContainerWindow() must be called later + wxControlContainer(); // the methods to be called from the window event handlers void HandleOnNavigationKey(wxNavigationKeyEvent& event); void HandleOnFocus(wxFocusEvent& event); void HandleOnWindowDestroy(wxWindowBase *child); - // should be called from SetFocus() - void DoSetFocus(); + // should be called from SetFocus(), returns false if we did nothing with + // the focus and the default processing should take place + bool DoSetFocus(); + + // 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 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; - // a default window (e.g. a button) or NULL - wxWindow *m_winDefault; + // a guard against infinite recursion + bool m_inSetFocus; + + DECLARE_NO_COPY_CLASS(wxControlContainer) }; -// this function is for wxWindows internal use only +// this function is for wxWidgets internal use only extern bool wxSetFocusToChild(wxWindow *win, wxWindow **child); // ---------------------------------------------------------------------------- @@ -78,14 +189,14 @@ extern bool wxSetFocusToChild(wxWindow *win, wxWindow **child); // ---------------------------------------------------------------------------- // declare the methods to be forwarded -#define WX_DECLARE_CONTROL_CONTAINER() \ - void OnNavigationKey(wxNavigationKeyEvent& event); \ - void OnFocus(wxFocusEvent& event); \ - virtual void OnChildFocus(wxChildFocusEvent& event); \ - virtual void SetFocus(); \ - virtual void RemoveChild(wxWindowBase *child); \ - virtual wxWindow *GetDefaultItem() const; \ - virtual wxWindow *SetDefaultItem(wxWindow *child) \ +#define WX_DECLARE_CONTROL_CONTAINER() \ + WX_DECLARE_CONTROL_CONTAINER_BASE(); \ + \ +public: \ + void OnNavigationKey(wxNavigationKeyEvent& event); \ + void OnFocus(wxFocusEvent& event); \ + virtual void OnChildFocus(wxChildFocusEvent& event); \ + virtual void SetFocus() // implement the event table entries for wxControlContainer #define WX_EVENT_TABLE_CONTROL_CONTAINER(classname) \ @@ -94,43 +205,44 @@ extern bool wxSetFocusToChild(wxWindow *win, wxWindow **child); EVT_NAVIGATION_KEY(classname::OnNavigationKey) // implement the methods forwarding to the wxControlContainer -#define WX_DELEGATE_TO_CONTROL_CONTAINER(classname, container) \ -wxWindow *classname::SetDefaultItem(wxWindow *child) \ -{ \ - return container->SetDefaultItem(child); \ -} \ - \ -wxWindow *classname::GetDefaultItem() const \ -{ \ - return container->GetDefaultItem(); \ -} \ - \ -void classname::OnNavigationKey( wxNavigationKeyEvent& event ) \ -{ \ - container->HandleOnNavigationKey(event); \ -} \ - \ -void classname::RemoveChild(wxWindowBase *child) \ -{ \ - container->HandleOnWindowDestroy(child); \ - \ - wxWindow::RemoveChild(child); \ -} \ - \ -void classname::SetFocus() \ -{ \ - container->DoSetFocus(); \ -} \ - \ -void classname::OnChildFocus(wxChildFocusEvent& event) \ -{ \ - container->SetLastFocus(event.GetWindow()); \ -} \ - \ -void classname::OnFocus(wxFocusEvent& event) \ -{ \ - container->HandleOnFocus(event); \ -} - +#define WX_DELEGATE_TO_CONTROL_CONTAINER(classname, basename) \ + WX_DELEGATE_TO_CONTROL_CONTAINER_BASE(classname, basename) \ + \ + void classname::RemoveChild(wxWindowBase *child) \ + { \ + m_container.HandleOnWindowDestroy(child); \ + \ + basename::RemoveChild(child); \ + \ + m_container.UpdateCanFocus(); \ + } \ + \ + void classname::OnNavigationKey( wxNavigationKeyEvent& event ) \ + { \ + m_container.HandleOnNavigationKey(event); \ + } \ + \ + void classname::SetFocus() \ + { \ + if ( !m_container.DoSetFocus() ) \ + basename::SetFocus(); \ + } \ + \ + void classname::SetFocusIgnoringChildren() \ + { \ + basename::SetFocus(); \ + } \ + \ + void classname::OnChildFocus(wxChildFocusEvent& event) \ + { \ + m_container.SetLastFocus(event.GetWindow()); \ + } \ + \ + void classname::OnFocus(wxFocusEvent& event) \ + { \ + m_container.HandleOnFocus(event); \ + } + +#endif // wxHAS_NATIVE_TAB_TRAVERSAL/!wxHAS_NATIVE_TAB_TRAVERSAL #endif // _WX_CONTAINR_H_