add more methods to wxNativeFontInfo: To/FromUserString and all the

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

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index f818d7ebb1d6321695b0556aca89cfbbc5880f2b..5ad3a7f00652e6ff53fda9736ee9cbe689efbef7 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -50,18 +50,21 @@ wxControlContainer::wxControlContainer(wxWindow *winParent)
 
 void wxControlContainer::SetLastFocus(wxWindow *win)
 {
 
 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;
+        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?") );
-

     m_winLastFocused = win;
 }
 
     m_winLastFocused = win;
 }
 


@@ -245,7 +248,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());


@@ -277,10 +280,24 @@ void wxControlContainer::DoSetFocus()
     //
     // RR: Removed for now. Let's see what happens..
 
     //
     // 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)
 }
 
 void wxControlContainer::HandleOnFocus(wxFocusEvent& event)