Unicode compilation fixes

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

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index c5133c803dd4003609508a69eb39518e369e6395..04a7794bfefc093259ef3f2484c9475f88a6c573 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -29,6 +29,9 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/log.h"
+    #include "wx/event.h"
+    #include "wx/window.h"

 #endif //WX_PRECOMP
 
 #include "wx/containr.h"
 #endif //WX_PRECOMP
 
 #include "wx/containr.h"


@@ -48,13 +51,9 @@ wxControlContainer::wxControlContainer(wxWindow *winParent)
 void wxControlContainer::SetLastFocus(wxWindow *win)
 {
     // find the last _immediate_ child which got focus
 void wxControlContainer::SetLastFocus(wxWindow *win)
 {
     // find the last _immediate_ child which got focus

-    while ( win )
+    while ( win && win != m_winParent )

     {
     {

-        wxWindow *parent = win->GetParent();
-        if ( parent == m_winParent )
-            break;
-
-        win = parent;
+        win = win->GetParent();

     }
 
     wxASSERT_MSG( win, _T("attempt to set last focus to not a child?") );
     }
 
     wxASSERT_MSG( win, _T("attempt to set last focus to not a child?") );


@@ -242,7 +241,7 @@ void wxControlContainer::HandleOnWindowDestroy(wxWindowBase *child)
 // focus handling
 // ----------------------------------------------------------------------------
 
 // focus handling
 // ----------------------------------------------------------------------------
 

-void wxControlContainer::DoSetFocus()
+bool wxControlContainer::DoSetFocus()

 {
     wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08x."),
                m_winParent->GetHandle());
 {
     wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08x."),
                m_winParent->GetHandle());


@@ -274,10 +273,7 @@ void wxControlContainer::DoSetFocus()
     //
     // RR: Removed for now. Let's see what happens..
 
     //
     // RR: Removed for now. Let's see what happens..
 

-    if ( !SetFocusToChild() )
-    {
-        m_winParent->SetFocus();
-    }
+    return SetFocusToChild();

 }
 
 void wxControlContainer::HandleOnFocus(wxFocusEvent& event)
 }
 
 void wxControlContainer::HandleOnFocus(wxFocusEvent& event)