X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f64c3bb2348ecd31a2f3973a6a10d1abff34e55..0f314c30b8c4ffbd7d87146f72be7a061d506235:/src/common/containr.cpp diff --git a/src/common/containr.cpp b/src/common/containr.cpp index ea61df47e3..368cee065d 100644 --- a/src/common/containr.cpp +++ b/src/common/containr.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "containr.h" #endif @@ -36,6 +36,10 @@ #include "wx/containr.h" +#ifdef __WXMAC__ + #include "wx/scrolbar.h" +#endif + // ============================================================================ // implementation // ============================================================================ @@ -57,7 +61,7 @@ bool wxControlContainer::AcceptsFocus() const // 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::Node *node = m_winParent->GetChildren().GetFirst(); + wxWindowList::compatibility_iterator node = m_winParent->GetChildren().GetFirst(); if ( !node ) return TRUE; @@ -181,7 +185,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) // 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 @@ -196,7 +200,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) node = forward ? children.GetFirst() : children.GetLast(); // we want to cycle over all nodes - start_node = (wxWindowList::Node *)NULL; + start_node = wxWindowList::compatibility_iterator(); } else { @@ -220,7 +224,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) } else { - start_node = (wxWindowList::Node *)NULL; + start_node = wxWindowList::compatibility_iterator(); } if ( !start_node && m_winLastFocused ) @@ -289,6 +293,9 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event ) // 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 @@ -409,7 +416,7 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused) } // 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();