Applied #15375 to stop event-sending in generic wxSpinCtrl ctor (eco)

[wxWidgets.git] / src / common / containr.cpp

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index ba1ffd220e7deed882b841587699f42c0899488f..50bbd6aefaba84856e3dbe32fa476686c522b385 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     06.08.01
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     06.08.01

-// RCS-ID:      $Id$

 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -153,6 +152,11 @@ bool wxControlContainerBase::DoSetFocus()
     return ret;
 }
 
     return ret;
 }
 

+bool wxControlContainerBase::AcceptsFocus() const
+{
+    return m_acceptsFocusSelf && m_winParent->CanBeFocused();
+}
+

 bool wxControlContainerBase::SetFocusToChild()
 {
     return wxSetFocusToChild(m_winParent, &m_winLastFocused);
 bool wxControlContainerBase::SetFocusToChild()
 {
     return wxSetFocusToChild(m_winParent, &m_winLastFocused);