Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more compilation and linking fixes for !wxHAS_NATIVE_TAB_TRAVERSAL after recent changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-06 19:16:07 +00:00
parent 15c1210982
commit d1cd787b75
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/wx/containr.h
View File

@@ -163,9 +163,6 @@ public:
// the focus and the default processing should take place // the focus and the default processing should take place
bool DoSetFocus(); bool DoSetFocus();
// can our child get the focus?
bool AcceptsFocus() const;
// called from OnChildFocus() handler, i.e. when one of our (grand) // called from OnChildFocus() handler, i.e. when one of our (grand)
// children gets the focus // children gets the focus
void SetLastFocus(wxWindow *win); void SetLastFocus(wxWindow *win);
@@ -192,18 +189,14 @@ extern bool wxSetFocusToChild(wxWindow *win, wxWindow **child);
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// declare the methods to be forwarded // declare the methods to be forwarded
#define WX_DECLARE_CONTROL_CONTAINER() \ #define WX_DECLARE_CONTROL_CONTAINER() \
public: \ WX_DECLARE_CONTROL_CONTAINER_BASE(); \
void OnNavigationKey(wxNavigationKeyEvent& event); \ \
void OnFocus(wxFocusEvent& event); \ public: \
void SetFocusIgnoringChildren(); \ void OnNavigationKey(wxNavigationKeyEvent& event); \
virtual void OnChildFocus(wxChildFocusEvent& event); \ void OnFocus(wxFocusEvent& event); \
virtual void SetFocus(); \ virtual void OnChildFocus(wxChildFocusEvent& event); \
virtual void RemoveChild(wxWindowBase *child); \ virtual void SetFocus()
virtual bool AcceptsFocus() const; \
\
protected: \
wxControlContainer m_container
// implement the event table entries for wxControlContainer // implement the event table entries for wxControlContainer
#define WX_EVENT_TABLE_CONTROL_CONTAINER(classname) \ #define WX_EVENT_TABLE_CONTROL_CONTAINER(classname) \