+void wxPanel::RemoveChild(wxWindowBase *child)
+{
+ if ( child == m_winLastFocused )
+ m_winLastFocused = NULL;
+ wxWindow::RemoveChild(child);
+}
+
+void wxPanel::SetFocus()
+{
+ wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08x."), 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 ( !SetFocusToChild() )
+ {
+ wxWindow::SetFocus();
+ }
+}
+
+void wxPanel::OnFocus(wxFocusEvent& event)
+{
+ wxLogTrace(_T("focus"), _T("OnFocus on wxPanel 0x%08x, name: %s"), GetHandle(), GetName().c_str() );
+
+ // If the panel gets 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();
+
+ event.Skip();
+}
+
+bool wxPanel::SetFocusToChild()
+{
+ return wxSetFocusToChild(this, &m_winLastFocused);
+}
+
+// ----------------------------------------------------------------------------
+// SetFocusToChild(): this function is used by wxPanel but also by wxFrame in
+// wxMSW, this is why it is outside of wxPanel class
+// ----------------------------------------------------------------------------
+
+bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
+{
+ wxCHECK_MSG( win, FALSE, _T("wxSetFocusToChild(): invalid window") );
+
+ if ( *childLastFocused )
+ {
+ // It might happen that the window got reparented or no longer accepts
+ // the focus.
+ if ( (*childLastFocused)->GetParent() == win &&
+ (*childLastFocused)->AcceptsFocusFromKeyboard() )
+ {
+ wxLogTrace(_T("focus"),
+ _T("SetFocusToChild() => last child (0x%08x)."),
+ (*childLastFocused)->GetHandle());
+
+ (*childLastFocused)->SetFocus();
+ return TRUE;
+ }
+ else
+ {
+ // it doesn't count as such any more
+ *childLastFocused = (wxWindow *)NULL;
+ }
+ }
+
+ // set the focus to the first child who wants it
+ wxWindowList::Node *node = win->GetChildren().GetFirst();
+ while ( node )
+ {
+ wxWindow *child = node->GetData();
+
+ if ( child->AcceptsFocusFromKeyboard() && !child->IsTopLevel() )
+ {
+ wxLogTrace(_T("focus"),
+ _T("SetFocusToChild() => first child (0x%08x)."),
+ child->GetHandle());
+
+ *childLastFocused = child; // should be redundant, but it is not
+ child->SetFocus();
+ return TRUE;
+ }
+
+ node = node->GetNext();
+ }
+
+ return FALSE;
+}
projects / wxWidgets.git / blobdiff