fix bug in Borland (bcc32 really hates ?)

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

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index c0073ebdb7d1e8d16df2b41f9cb805043e0f3807..cf52acee49c312a271a956b9afa6acfb96cc92a6 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -6,7 +6,7 @@
 // Created:     06.08.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows license
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -247,10 +247,12 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
             event.SetEventObject(m_winParent);
             if ( !child->GetEventHandler()->ProcessEvent(event) )
             {
+                // set it first in case SetFocusFromKbd() results in focus
+                // change too
+                m_winLastFocused = child;
+
                 // everything is simple: just give focus to it
                 child->SetFocusFromKbd();
-
-                m_winLastFocused = child;
             }
             //else: the child manages its focus itself
 
@@ -285,42 +287,21 @@ void wxControlContainer::HandleOnWindowDestroy(wxWindowBase *child)
 
 bool wxControlContainer::DoSetFocus()
 {
-    wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08x."),
-               m_winParent->GetHandle());
-
-    // If the panel gets the focus *by way of getting it set directly*
-    // we move the focus to the first window that can get it.
-
-    // VZ: no, we set the focus to the last window too. I don't understand why
-    //     should we make this distinction: if an app wants to set focus to
-    //     some precise control, it may always do it directly, but if we don't
-    //     use m_winLastFocused here, the focus won't be set correctly after a
-    //     notebook page change nor after frame activation under MSW (it calls
-    //     SetFocus too)
-    //
-    // RR: yes, when I the tab key to navigate in a panel with some controls and
-    //     a notebook and the focus jumps to the notebook (typically coming from
-    //     a button at the top) the notebook should focus the first child in the
-    //     current notebook page, not the last one which would otherwise get the
-    //     focus if you used the tab key to navigate from the current notebook
-    //     page to button at the bottom. See every page in the controls sample.
-    //
-    // VZ: ok, but this still doesn't (at least I don't see how it can) take
-    //     care of first/last child problem: i.e. if Shift-TAB is pressed in a
-    //     situation like above, the focus should be given to the last child,
-    //     not the first one (and not to the last focused one neither) - I
-    //     think my addition to OnNavigationKey() above takes care of it.
-    //     Keeping #ifdef __WXGTK__ for now, but please try removing it and see
-    //     what happens.
-    //
-    // RR: Removed for now. Let's see what happens..
-
-    // if our child already has focus, don't take it away from it
+    wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08lx."),
+               (unsigned long)m_winParent->GetHandle());
+
+    // when the panel gets the focus we move the focus to either the last
+    // window that had the focus or the first one that can get it unless the
+    // focus had been already set to some other child
+
     wxWindow *win = wxWindow::FindFocus();
     while ( win )
     {
         if ( win == m_winParent )
+        {
+            // our child already has focus, don't take it away from it
             return TRUE;
+        }
 
         if ( win->IsTopLevel() )
         {
@@ -337,14 +318,11 @@ bool wxControlContainer::DoSetFocus()
 
 void wxControlContainer::HandleOnFocus(wxFocusEvent& event)
 {
-    wxLogTrace(_T("focus"), _T("OnFocus on wxPanel 0x%08x, name: %s"),
-               m_winParent->GetHandle(),
+    wxLogTrace(_T("focus"), _T("OnFocus on wxPanel 0x%08lx, name: %s"),
+               (unsigned long)m_winParent->GetHandle(),
                m_winParent->GetName().c_str() );
 
-    // If we panel got the focus *by way of getting clicked on*
-    // we move the focus to either the last window that had the
-    // focus or the first one that can get it.
-    (void)SetFocusToChild();
+    DoSetFocus();
 
     event.Skip();
 }
@@ -371,8 +349,8 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
         if ( (*childLastFocused)->GetParent() == win )
         {
             wxLogTrace(_T("focus"),
-                       _T("SetFocusToChild() => last child (0x%08x)."),
-                       (*childLastFocused)->GetHandle());
+                       _T("SetFocusToChild() => last child (0x%08lx)."),
+                       (unsigned long)(*childLastFocused)->GetHandle());
 
             // not SetFocusFromKbd(): we're restoring focus back to the old
             // window and not setting it as the result of a kbd action
@@ -395,8 +373,8 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
         if ( child->AcceptsFocusFromKeyboard() && !child->IsTopLevel() )
         {
             wxLogTrace(_T("focus"),
-                       _T("SetFocusToChild() => first child (0x%08x)."),
-                       child->GetHandle());
+                       _T("SetFocusToChild() => first child (0x%08lx)."),
+                       (unsigned long)child->GetHandle());
 
             *childLastFocused = child;  // should be redundant, but it is not
             child->SetFocusFromKbd();