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 c387c5da204f16b21fa38dcd8d994ad9a702b2ca..624382ff2882ede90904a81d65fa7b13fc86657d 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -45,6 +45,7 @@ wxControlContainer::wxControlContainer(wxWindow *winParent)
     m_winParent = winParent;
 
     m_winLastFocused =
     m_winParent = winParent;
 
     m_winLastFocused =

+    m_winTmpDefault =

     m_winDefault = NULL;
 }
 
     m_winDefault = NULL;
 }
 


@@ -237,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;
             }


@@ -263,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;

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


@@ -360,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


@@ -383,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;
         }