add a critical section protecting ms_prev variables (replaces patch 1819224)

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

diff --git a/include/wx/containr.h b/include/wx/containr.h
index 0d38361739f15c500d7b91842a2afc52fbf72b90..87ab324a281efe6ea544d132e1d56acebd9cdf0b 100644 (file)
--- a/include/wx/containr.h
+++ b/include/wx/containr.h
@@ -70,10 +70,9 @@ public:
     // wxListCtrl) and so should get focus for ourselves
     bool AcceptsFocusRecursively() const { return true; }
 
     // wxListCtrl) and so should get focus for ourselves
     bool AcceptsFocusRecursively() const { return true; }
 

-    // call this when the number of children of the window changes
-    //
-    // note that we have any children, this panel (used just as container for
-    // them) shouldn't get focus for itself
+    // Call this when the number of children of the window changes.
+    // If we have any children, this panel (used just as container for
+    // them) shouldn't get focus for itself.

     void UpdateCanFocus() { SetCanFocus(!HasAnyFocusableChildren()); }
 
 protected:
     void UpdateCanFocus() { SetCanFocus(!HasAnyFocusableChildren()); }
 
 protected:


@@ -177,7 +176,7 @@ protected:
                                                                               \
     void classname::SetFocusIgnoringChildren()                                \
     {                                                                         \
                                                                               \
     void classname::SetFocusIgnoringChildren()                                \
     {                                                                         \

-        basename::SetFocusIgnoringChildren();                                 \
+        basename::SetFocus();                                                 \

     }
 
 #else // !wxHAS_NATIVE_TAB_TRAVERSAL
     }
 
 #else // !wxHAS_NATIVE_TAB_TRAVERSAL