need wxUSE_WCHAR_T around wxConvLocal

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

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index c5133c803dd4003609508a69eb39518e369e6395..b76ec648d6ba04a4e30f6f538c2ccc5db9d5291f 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -29,6 +29,9 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/event.h"
+    #include "wx/window.h"
 #endif //WX_PRECOMP
 
 #include "wx/containr.h"
@@ -47,17 +50,24 @@ wxControlContainer::wxControlContainer(wxWindow *winParent)
 
 void wxControlContainer::SetLastFocus(wxWindow *win)
 {
-    // find the last _immediate_ child which got focus
-    while ( win )
+    // if we're setting the focus
+    if ( win )
     {
-        wxWindow *parent = win->GetParent();
-        if ( parent == m_winParent )
-            break;
+        // find the last _immediate_ child which got focus but be prepared to
+        // handle the case when win == m_winParent as well
+        wxWindow *winParent = win;
+        while ( winParent != m_winParent )
+        {
+            win = winParent;
+            winParent = win->GetParent();
 
-        win = parent;
-    }
+            // Yes, this can happen, though in a totally pathological case.
+            // like when detaching a menubar from a frame with a child which
+            // has pushed itself as an event handler for the menubar.  (wxGtk)
 
-    wxASSERT_MSG( win, _T("attempt to set last focus to not a child?") );
+            wxASSERT_MSG( winParent, _T("Setting last-focus for a window that is not our child?") );
+        }
+    }
 
     m_winLastFocused = win;
 }
@@ -242,7 +252,7 @@ void wxControlContainer::HandleOnWindowDestroy(wxWindowBase *child)
 // focus handling
 // ----------------------------------------------------------------------------
 
-void wxControlContainer::DoSetFocus()
+bool wxControlContainer::DoSetFocus()
 {
     wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08x."),
                m_winParent->GetHandle());
@@ -274,10 +284,24 @@ void wxControlContainer::DoSetFocus()
     //
     // RR: Removed for now. Let's see what happens..
 
-    if ( !SetFocusToChild() )
+    // if our child already has focus, don't take it away from it
+    wxWindow *win = wxWindow::FindFocus();
+    while ( win )
     {
-        m_winParent->SetFocus();
+        if ( win == m_winParent )
+            return TRUE;
+
+        if ( win->IsTopLevel() )
+        {
+            // don't look beyond the first top level parent - useless and
+            // unnecessary
+            break;
+        }
+
+        win = win->GetParent();
     }
+
+    return SetFocusToChild();
 }
 
 void wxControlContainer::HandleOnFocus(wxFocusEvent& event)