don't define _CRTDBG_MAP_ALLOC as it is apparently unnecessary (patch 995135)

[wxWidgets.git] / include / wx / containr.h

diff --git a/include/wx/containr.h b/include/wx/containr.h
index e5399b71ce5df0d20210c6bff11f898e083dea31..cd308a23069439f246521c436fdcc24d484069b8 100644 (file)
--- a/include/wx/containr.h
+++ b/include/wx/containr.h
@@ -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);
 
 // ----------------------------------------------------------------------------