updates from Adrián González Alba

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

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 700d9eb782df27545b9c194ba7faf93ba8d2f610..0a034ba01e9d673fa28953d77653a2df9a9bf35b 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -30,10 +30,9 @@
     #include "wx/window.h"
     #include "wx/scrolbar.h"
     #include "wx/radiobut.h"
+    #include "wx/containr.h"
 #endif //WX_PRECOMP
 
-#include "wx/containr.h"
-
 // trace mask for focus messages
 #define TRACE_FOCUS _T("focus")
 
@@ -44,10 +43,7 @@
 wxControlContainer::wxControlContainer(wxWindow *winParent)
 {
     m_winParent = winParent;
-
-    m_winLastFocused =
-    m_winTmpDefault =
-    m_winDefault = NULL;
+    m_winLastFocused = NULL;
     m_inSetFocus = false;
 }
 
@@ -505,12 +501,6 @@ void wxControlContainer::HandleOnWindowDestroy(wxWindowBase *child)
 {
     if ( child == m_winLastFocused )
         m_winLastFocused = NULL;
-
-    if ( child == m_winDefault )
-        m_winDefault = NULL;
-
-    if ( child == m_winTmpDefault )
-        m_winTmpDefault = NULL;
 }
 
 // ----------------------------------------------------------------------------