more compilation and linking fixes for !wxHAS_NATIVE_TAB_TRAVERSAL after recent changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
15c1210982
commit
d1cd787b75
@ -163,9 +163,6 @@ public:
|
||||
// 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);
|
||||
@ -192,18 +189,14 @@ extern bool wxSetFocusToChild(wxWindow *win, wxWindow **child);
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// 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); \
|
||||
virtual void SetFocus()
|
||||
|
||||
// implement the event table entries for wxControlContainer
|
||||
#define WX_EVENT_TABLE_CONTROL_CONTAINER(classname) \
|
||||
|
Loading…
Reference in New Issue
Block a user