X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3251b8346678b487755102e2ddb5f2071ee1f1ca..4fab71288ea3629e48fe100b337d9465266ef149:/include/wx/containr.h diff --git a/include/wx/containr.h b/include/wx/containr.h index fd3ba533ce..cd308a2306 100644 --- a/include/wx/containr.h +++ b/include/wx/containr.h @@ -13,7 +13,7 @@ #ifndef _WX_CONTAINR_H_ #define _WX_CONTAINR_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "containr.h" #endif @@ -92,10 +92,13 @@ protected: // a temporary override of m_winDefault, use the latter if NULL wxWindow *m_winTmpDefault; + // a guard against infinite recursion + bool m_inSetFocus; + DECLARE_NO_COPY_CLASS(wxControlContainer) }; -// this function is for wxWindows internal use only +// this function is for wxWidgets internal use only extern bool wxSetFocusToChild(wxWindow *win, wxWindow **child); // ----------------------------------------------------------------------------