X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..2952b4b9e438896370163a0a7026ad446062b8e6:/include/wx/containr.h diff --git a/include/wx/containr.h b/include/wx/containr.h index cd308a2306..cd79e5dd5b 100644 --- a/include/wx/containr.h +++ b/include/wx/containr.h @@ -13,10 +13,6 @@ #ifndef _WX_CONTAINR_H_ #define _WX_CONTAINR_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "containr.h" -#endif - class WXDLLEXPORT wxFocusEvent; class WXDLLEXPORT wxNavigationKeyEvent; class WXDLLEXPORT wxWindow; @@ -65,7 +61,7 @@ public: void HandleOnFocus(wxFocusEvent& event); void HandleOnWindowDestroy(wxWindowBase *child); - // should be called from SetFocus(), returns FALSE if we did nothing with + // should be called from SetFocus(), returns false if we did nothing with // the focus and the default processing should take place bool DoSetFocus(); @@ -113,6 +109,7 @@ public: \ void OnFocus(wxFocusEvent& event); \ virtual void OnChildFocus(wxChildFocusEvent& event); \ virtual void SetFocus(); \ + virtual void SetFocusIgnoringChildren(); \ virtual void RemoveChild(wxWindowBase *child); \ virtual wxWindow *GetDefaultItem() const; \ virtual wxWindow *SetDefaultItem(wxWindow *child); \ @@ -163,6 +160,11 @@ void classname::SetFocus() \ wxWindow::SetFocus(); \ } \ \ +void classname::SetFocusIgnoringChildren() \ +{ \ + wxWindow::SetFocus(); \ +} \ + \ void classname::OnChildFocus(wxChildFocusEvent& event) \ { \ m_container.SetLastFocus(event.GetWindow()); \