// wxControlContainerBase: common part used in both native and generic cases
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxControlContainerBase
+class WXDLLIMPEXP_CORE wxControlContainerBase
{
public:
// default ctor, SetContainerWindow() must be called later
// 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)
{
- wxASSERT_MSG( !m_winParent, _T("shouldn't be called twice") );
+ wxASSERT_MSG( !m_winParent, wxT("shouldn't be called twice") );
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);
// wxListCtrl) and so should get focus for ourselves
bool AcceptsFocusRecursively() const { return true; }
- // call this when the number of children of the window changes
- //
- // note that we have any children, this panel (used just as container for
- // them) shouldn't get focus for itself
+ // this is used to determine whether we can accept focus when Tab or
+ // another navigation key is pressed -- we alsways can, for the same reason
+ // as mentioned above for AcceptsFocusRecursively()
+ bool AcceptsFocusFromKeyboard() 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:
+ // 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;
// 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,
public: \
virtual bool AcceptsFocus() const; \
virtual bool AcceptsFocusRecursively() const; \
+ virtual bool AcceptsFocusFromKeyboard() const; \
virtual void AddChild(wxWindowBase *child); \
virtual void RemoveChild(wxWindowBase *child); \
+ virtual void SetFocus(); \
void SetFocusIgnoringChildren(); \
void AcceptFocus(bool acceptFocus) \
{ \
return m_container.AcceptsFocusRecursively(); \
} \
\
+ void classname::SetFocus() \
+ { \
+ if ( !m_container.DoSetFocus() ) \
+ basename::SetFocus(); \
+ } \
+ \
bool classname::AcceptsFocus() const \
{ \
return m_container.AcceptsFocus(); \
+ } \
+ \
+ bool classname::AcceptsFocusFromKeyboard() const \
+ { \
+ return m_container.AcceptsFocusFromKeyboard(); \
}
-
#ifdef wxHAS_NATIVE_TAB_TRAVERSAL
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// this must be a real class as we forward-declare it elsewhere
-class WXDLLEXPORT wxControlContainer : public wxControlContainerBase
+class WXDLLIMPEXP_CORE 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)
\
void classname::SetFocusIgnoringChildren() \
{ \
- SetFocus(); \
+ basename::SetFocus(); \
}
#else // !wxHAS_NATIVE_TAB_TRAVERSAL
// wxControlContainer for TAB navigation implemented in wx itself
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxControlContainer : public wxControlContainerBase
+class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase
{
public:
// default ctor, SetContainerWindow() must be called later
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();
-
// 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)
+ wxDECLARE_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
public: \
void OnNavigationKey(wxNavigationKeyEvent& event); \
void OnFocus(wxFocusEvent& event); \
- virtual void OnChildFocus(wxChildFocusEvent& event); \
- virtual void SetFocus()
+ virtual void OnChildFocus(wxChildFocusEvent& event)
// implement the event table entries for wxControlContainer
#define WX_EVENT_TABLE_CONTROL_CONTAINER(classname) \
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()); \
+ event.Skip(); \
} \
\
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_
projects / wxWidgets.git / blobdiff