wxSTC begins to work on wxMac...

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

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 5ad3a7f00652e6ff53fda9736ee9cbe689efbef7..624382ff2882ede90904a81d65fa7b13fc86657d 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -45,11 +45,18 @@ wxControlContainer::wxControlContainer(wxWindow *winParent)
     m_winParent = winParent;
 
     m_winLastFocused =
     m_winParent = winParent;
 
     m_winLastFocused =

+    m_winTmpDefault =

     m_winDefault = NULL;
 }
 
 void wxControlContainer::SetLastFocus(wxWindow *win)
 {
     m_winDefault = NULL;
 }
 
 void wxControlContainer::SetLastFocus(wxWindow *win)
 {

+    // the panel itself should never get the focus at all but if it does happen
+    // temporarily (as it seems to do under wxGTK), at the very least don't
+    // forget our previous m_winLastFocused
+    if ( win == m_winParent )
+        return;
+

     // if we're setting the focus
     if ( win )
     {
     // if we're setting the focus
     if ( win )
     {


@@ -60,12 +67,27 @@ void wxControlContainer::SetLastFocus(wxWindow *win)
         {
             win = winParent;
             winParent = win->GetParent();
         {
             win = winParent;
             winParent = win->GetParent();

-        }

 
 

-        wxASSERT_MSG( win, _T("attempt to set last focus to not a child?") );
+            // 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( winParent, _T("Setting last-focus for a window that is not our child?") );
+        }

     }
 
     m_winLastFocused = win;
     }
 
     m_winLastFocused = win;

+
+    if ( win )
+    {
+        wxLogTrace(_T("focus"), _T("Set last focus to %s(%s)"),
+                   win->GetClassInfo()->GetClassName(),
+                   win->GetLabel().c_str());
+    }
+    else
+    {
+        wxLogTrace(_T("focus"), _T("No more last focus"));
+    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -216,7 +238,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
             if ( !child->GetEventHandler()->ProcessEvent(event) )
             {
                 // everything is simple: just give focus to it
             if ( !child->GetEventHandler()->ProcessEvent(event) )
             {
                 // everything is simple: just give focus to it

-                child->SetFocus();
+                child->SetFocusFromKbd();

 
                 m_winLastFocused = child;
             }
 
                 m_winLastFocused = child;
             }


@@ -242,6 +264,9 @@ void wxControlContainer::HandleOnWindowDestroy(wxWindowBase *child)
 
     if ( child == m_winDefault )
         m_winDefault = NULL;
 
     if ( child == m_winDefault )
         m_winDefault = NULL;

+
+    if ( child == m_winTmpDefault )
+        m_winTmpDefault = NULL;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -339,7 +364,7 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
                        _T("SetFocusToChild() => last child (0x%08x)."),
                        (*childLastFocused)->GetHandle());
 
                        _T("SetFocusToChild() => last child (0x%08x)."),
                        (*childLastFocused)->GetHandle());
 

-            (*childLastFocused)->SetFocus();
+            (*childLastFocused)->SetFocusFromKbd();

             return TRUE;
         }
         else
             return TRUE;
         }
         else


@@ -362,7 +387,7 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
                        child->GetHandle());
 
             *childLastFocused = child;  // should be redundant, but it is not
                        child->GetHandle());
 
             *childLastFocused = child;  // should be redundant, but it is not

-            child->SetFocus();
+            child->SetFocusFromKbd();

             return TRUE;
         }
 
             return TRUE;
         }