changed wxControlContainer to avoid triggering tons of warnings from VC++ at
warning level 4 ("'this' : used in base member initializer list" is really the stupidiest warning I've ever seen) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -39,14 +39,14 @@ class WXDLLEXPORT wxControlContainer
|
||||
{
|
||||
public:
|
||||
// ctors and such
|
||||
wxControlContainer(wxWindow *winParent);
|
||||
wxControlContainer(wxWindow *winParent = NULL);
|
||||
void SetContainerWindow(wxWindow *winParent) { m_winParent = winParent; }
|
||||
|
||||
// default item access
|
||||
wxWindow *GetDefaultItem() const { return m_winDefault; }
|
||||
wxWindow *SetDefaultItem(wxWindow *win)
|
||||
{ wxWindow *winOld = m_winDefault; m_winDefault = win; return winOld; }
|
||||
|
||||
void SetLastFocus(wxWindow *win);
|
||||
|
||||
// the methods to be called from the window event handlers
|
||||
void HandleOnNavigationKey(wxNavigationKeyEvent& event);
|
||||
void HandleOnFocus(wxFocusEvent& event);
|
||||
@@ -56,6 +56,10 @@ public:
|
||||
// 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();
|
||||
|
Reference in New Issue
Block a user