blind fix for wxGetEmptyString() compilation with wxUSE_STL == 1

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

diff --git a/include/wx/containr.h b/include/wx/containr.h
index e5399b71ce5df0d20210c6bff11f898e083dea31..a70b4eadefdbddfbc660dab7c4318765614efd3b 100644 (file)
--- a/include/wx/containr.h
+++ b/include/wx/containr.h
@@ -65,7 +65,7 @@ public:
     void HandleOnFocus(wxFocusEvent& event);
     void HandleOnWindowDestroy(wxWindowBase *child);
 
     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();
 
     // the focus and the default processing should take place
     bool DoSetFocus();
 


@@ -92,10 +92,13 @@ protected:
     // a temporary override of m_winDefault, use the latter if NULL
     wxWindow *m_winTmpDefault;
 
     // 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)
 };
 
     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);
 
 // ----------------------------------------------------------------------------
 extern bool wxSetFocusToChild(wxWindow *win, wxWindow **child);
 
 // ----------------------------------------------------------------------------