// Created: 06.08.01
// RCS-ID: $Id$
// Copyright: (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License: wxWindows license
+// License: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "containr.h"
#endif
#include "wx/containr.h"
+#ifdef __WXMAC__
+ #include "wx/scrolbar.h"
+#endif
+
// ============================================================================
// implementation
// ============================================================================
m_winDefault = NULL;
}
+bool wxControlContainer::AcceptsFocus() const
+{
+ // if we're not shown or disabled, we can't accept focus
+ if ( m_winParent->IsShown() && m_winParent->IsEnabled() )
+ {
+ // otherwise we can accept focus either if we have no children at all
+ // (in this case we're probably not used as a container) or only when
+ // at least one child will accept focus
+ wxWindowList::compatibility_iterator node = m_winParent->GetChildren().GetFirst();
+ if ( !node )
+ return TRUE;
+
+#ifdef __WXMAC__
+ // wxMac has eventually the two scrollbars as children, they don't count
+ // as real children in the algorithm mentioned above
+ bool hasRealChildren = false ;
+#endif
+
+ while ( node )
+ {
+ wxWindow *child = node->GetData();
+
+ if ( child->AcceptsFocus() )
+ {
+ return TRUE;
+ }
+
+#ifdef __WXMAC__
+ wxScrollBar *sb = wxDynamicCast( child , wxScrollBar ) ;
+ if ( sb == NULL || !m_winParent->MacIsWindowScrollbar( sb ) )
+ hasRealChildren = true ;
+#endif
+ node = node->GetNext();
+ }
+
+#ifdef __WXMAC__
+ if ( !hasRealChildren )
+ return TRUE ;
+#endif
+ }
+
+ return FALSE;
+}
+
void wxControlContainer::SetLastFocus(wxWindow *win)
{
// the panel itself should never get the focus at all but if it does happen
// the node of the children list from which we should start looking for the
// next acceptable child
- wxWindowList::Node *node, *start_node;
+ wxWindowList::compatibility_iterator node, start_node;
// we should start from the first/last control and not from the one which
// had focus the last time if we're propagating the event downwards because
node = forward ? children.GetFirst() : children.GetLast();
// we want to cycle over all nodes
- start_node = (wxWindowList::Node *)NULL;
+ start_node = wxWindowList::compatibility_iterator();
}
else
{
}
else
{
- start_node = (wxWindowList::Node *)NULL;
+ start_node = wxWindowList::compatibility_iterator();
}
if ( !start_node && m_winLastFocused )
// and instead give it to the first/last child depending from which
// direction we're coming
event.SetEventObject(m_winParent);
+ // disable propagation for this call as otherwise the event might
+ // bounce back to us.
+ wxPropagationDisabler disableProp(event);
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
wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08lx."),
(unsigned long)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
+ // 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() )
{
(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();
}
}
// set the focus to the first child who wants it
- wxWindowList::Node *node = win->GetChildren().GetFirst();
+ wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
while ( node )
{
wxWindow *child = node->GetData();
_T("SetFocusToChild() => first child (0x%08lx)."),
(unsigned long)child->GetHandle());
- *childLastFocused = child; // should be redundant, but it is not
+ *childLastFocused = child;
child->SetFocusFromKbd();
return TRUE;
}
return FALSE;
}
+
projects / wxWidgets.git / blobdiff