fixed incorrect use of wxVector<> in wxXRC

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

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index 84be03d1462d980da5ad0ac0434d8519fd6ac7a2..d441b5c7c469e30d08e690437f460c9889359af4 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -28,8 +28,6 @@
     #include "wx/containr.h"
 #endif
 
     #include "wx/containr.h"
 #endif
 

-#ifndef wxHAS_NATIVE_TAB_TRAVERSAL
-

 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/event.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/event.h"


@@ -45,50 +43,95 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-wxControlContainer::wxControlContainer(wxWindow *winParent)
-{
-    m_winParent = winParent;
-    m_winLastFocused = NULL;
-    m_inSetFocus = false;
-}
+// ----------------------------------------------------------------------------
+// wxControlContainerBase
+// ----------------------------------------------------------------------------

 
 

-bool wxControlContainer::AcceptsFocus() const
+void wxControlContainerBase::SetCanFocus(bool acceptsFocus)

 {
 {

-    // 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
-    // accepts focus
-    wxWindowList::compatibility_iterator node = m_winParent->GetChildren().GetFirst();
-    if ( !node )
-        return true;
+    if ( acceptsFocus == m_acceptsFocus )
+        return;

 
 

-#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
+    m_acceptsFocus = acceptsFocus;

 
 

-    while ( node )
+    m_winParent->SetCanFocus(m_acceptsFocus);
+}
+
+bool wxControlContainerBase::HasAnyFocusableChildren() const
+{
+    const wxWindowList& children = m_winParent->GetChildren();
+    for ( wxWindowList::const_iterator i = children.begin(),
+                                     end = children.end();
+          i != end;
+          ++i )

     {
     {

-        wxWindow *child = node->GetData();
-        node = node->GetNext();
+        const wxWindow * const child = *i;

 
 

-#ifdef __WXMAC__
-        if ( m_winParent->MacIsWindowScrollbar( child ) )
+        if ( !m_winParent->IsClientAreaChild(child) )

             continue;
             continue;

-        hasRealChildren = true ;
-#endif
+

         if ( child->CanAcceptFocus() )
         if ( child->CanAcceptFocus() )

+            return true;
+    }
+
+    return false;
+}
+
+bool wxControlContainerBase::DoSetFocus()
+{
+    wxLogTrace(TRACE_FOCUS, _T("SetFocus on wxPanel 0x%p."),
+               m_winParent->GetHandle());
+
+    if (m_inSetFocus)
+        return true;
+
+    // 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;
         }
             return true;
         }

+
+        if ( win->IsTopLevel() )
+        {
+            // don't look beyond the first top level parent - useless and
+            // unnecessary
+            break;
+        }
+
+        win = win->GetParent();

     }
 
     }
 

-#ifdef __WXMAC__
-    if ( !hasRealChildren )
-        return true ;
-#endif
+    // protect against infinite recursion:
+    m_inSetFocus = true;

 
 

-    return false;
+    bool ret = SetFocusToChild();
+
+    m_inSetFocus = false;
+
+    return ret;
+}
+
+bool wxControlContainerBase::SetFocusToChild()
+{
+    return wxSetFocusToChild(m_winParent, &m_winLastFocused);
+}
+
+#ifndef wxHAS_NATIVE_TAB_TRAVERSAL
+
+// ----------------------------------------------------------------------------
+// generic wxControlContainer
+// ----------------------------------------------------------------------------
+
+wxControlContainer::wxControlContainer()
+{
+    m_winLastFocused = NULL;

 }
 
 void wxControlContainer::SetLastFocus(wxWindow *win)
 }
 
 void wxControlContainer::SetLastFocus(wxWindow *win)


@@ -133,12 +176,16 @@ void wxControlContainer::SetLastFocus(wxWindow *win)
     }
 
     // propagate the last focus upwards so that our parent can set focus back
     }
 
     // propagate the last focus upwards so that our parent can set focus back

-    // to us if it loses it now and regains later
-    wxWindow *parent = m_winParent->GetParent();
-    if ( parent )
+    // to us if it loses it now and regains later; do *not* do this if we are
+    // a toplevel window (e.g. wxDialog) that has another frame as its parent
+    if ( !m_winParent->IsTopLevel() )

     {
     {

-        wxChildFocusEvent eventFocus(m_winParent);
-        parent->GetEventHandler()->ProcessEvent(eventFocus);
+        wxWindow *parent = m_winParent->GetParent();
+        if ( parent )
+        {
+            wxChildFocusEvent eventFocus(m_winParent);
+            parent->GetEventHandler()->ProcessEvent(eventFocus);
+        }

     }
 }
 
     }
 }
 


@@ -147,7 +194,7 @@ void wxControlContainer::SetLastFocus(wxWindow *win)
 // within the same group. Used by wxSetFocusToChild on wxMSW
 // --------------------------------------------------------------------
 
 // within the same group. Used by wxSetFocusToChild on wxMSW
 // --------------------------------------------------------------------
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__) && wxUSE_RADIOBTN

 
 wxRadioButton* wxGetPreviousButtonInGroup(wxRadioButton *btn)
 {
 
 wxRadioButton* wxGetPreviousButtonInGroup(wxRadioButton *btn)
 {


@@ -370,12 +417,12 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
 
         if ( winFocus )
         {
 
         if ( winFocus )
         {

-#ifdef __WXMSW__
+#if defined(__WXMSW__) && wxUSE_RADIOBTN

             // If we are in a radio button group, start from the first item in the
             // group
             if ( event.IsFromTab() && wxIsKindOf(winFocus, wxRadioButton ) )
                 winFocus = wxGetFirstButtonInGroup((wxRadioButton*)winFocus);
             // If we are in a radio button group, start from the first item in the
             // group
             if ( event.IsFromTab() && wxIsKindOf(winFocus, wxRadioButton ) )
                 winFocus = wxGetFirstButtonInGroup((wxRadioButton*)winFocus);

-#endif
+#endif // __WXMSW__

             // ok, we found the focus - now is it our child?
             start_node = children.Find( winFocus );
         }
             // ok, we found the focus - now is it our child?
             start_node = children.Find( winFocus );
         }


@@ -449,7 +496,15 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
 
         wxWindow *child = node->GetData();
 
 
         wxWindow *child = node->GetData();
 

-#ifdef __WXMSW__
+        // don't TAB to another TLW
+        if ( child->IsTopLevel() )
+        {
+            node = forward ? node->GetNext() : node->GetPrevious();
+
+            continue;
+        }
+
+#if defined(__WXMSW__) && wxUSE_RADIOBTN

         if ( event.IsFromTab() )
         {
             if ( wxIsKindOf(child, wxRadioButton) )
         if ( event.IsFromTab() )
         {
             if ( wxIsKindOf(child, wxRadioButton) )


@@ -550,47 +605,6 @@ void wxControlContainer::HandleOnWindowDestroy(wxWindowBase *child)
 // focus handling
 // ----------------------------------------------------------------------------
 
 // focus handling
 // ----------------------------------------------------------------------------
 

-bool wxControlContainer::DoSetFocus()
-{
-    wxLogTrace(TRACE_FOCUS, _T("SetFocus on wxPanel 0x%p."),
-               m_winParent->GetHandle());
-
-    if (m_inSetFocus)
-        return true;
-
-    // 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() )
-        {
-            // don't look beyond the first top level parent - useless and
-            // unnecessary
-            break;
-        }
-
-        win = win->GetParent();
-    }
-
-    // protect against infinite recursion:
-    m_inSetFocus = true;
-
-    bool ret = SetFocusToChild();
-
-    m_inSetFocus = false;
-
-    return ret;
-}
-

 void wxControlContainer::HandleOnFocus(wxFocusEvent& event)
 {
     wxLogTrace(TRACE_FOCUS, _T("OnFocus on wxPanel 0x%p, name: %s"),
 void wxControlContainer::HandleOnFocus(wxFocusEvent& event)
 {
     wxLogTrace(TRACE_FOCUS, _T("OnFocus on wxPanel 0x%p, name: %s"),


@@ -602,11 +616,18 @@ void wxControlContainer::HandleOnFocus(wxFocusEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

+
+#else
+  // wxHAS_NATIVE_TAB_TRAVERSAL
+

 bool wxControlContainer::SetFocusToChild()
 {
 bool wxControlContainer::SetFocusToChild()
 {

-    return wxSetFocusToChild(m_winParent, &m_winLastFocused);
+    return wxSetFocusToChild(m_winParent, NULL);

 }
 
 }
 

+
+#endif // !wxHAS_NATIVE_TAB_TRAVERSAL
+

 // ----------------------------------------------------------------------------
 // SetFocusToChild(): this function is used by wxPanel but also by wxFrame in
 // wxMSW, this is why it is outside of wxControlContainer class
 // ----------------------------------------------------------------------------
 // SetFocusToChild(): this function is used by wxPanel but also by wxFrame in
 // wxMSW, this is why it is outside of wxControlContainer class


@@ -615,10 +636,10 @@ bool wxControlContainer::SetFocusToChild()
 bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
 {
     wxCHECK_MSG( win, false, _T("wxSetFocusToChild(): invalid window") );
 bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
 {
     wxCHECK_MSG( win, false, _T("wxSetFocusToChild(): invalid window") );

-    wxCHECK_MSG( childLastFocused, false,
-                 _T("wxSetFocusToChild(): NULL child poonter") );
+    //    wxCHECK_MSG( childLastFocused, false,
+    //             _T("wxSetFocusToChild(): NULL child poonter") );

 
 

-    if ( *childLastFocused )
+    if ( childLastFocused && *childLastFocused )

     {
         // It might happen that the window got reparented
         if ( (*childLastFocused)->GetParent() == win )
     {
         // It might happen that the window got reparented
         if ( (*childLastFocused)->GetParent() == win )


@@ -646,14 +667,13 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
         wxWindow *child = node->GetData();
         node = node->GetNext();
 
         wxWindow *child = node->GetData();
         node = node->GetNext();
 

-#ifdef __WXMAC__
-        if ( child->GetParent()->MacIsWindowScrollbar( child ) )
+        // skip special windows:
+        if ( !win->IsClientAreaChild(child) )

             continue;
             continue;

-#endif
-        
+

         if ( child->CanAcceptFocusFromKeyboard() && !child->IsTopLevel() )
         {
         if ( child->CanAcceptFocusFromKeyboard() && !child->IsTopLevel() )
         {

-#ifdef __WXMSW__
+#if defined(__WXMSW__) && wxUSE_RADIOBTN

             // If a radiobutton is the first focusable child, search for the
             // selected radiobutton in the same group
             wxRadioButton* btn = wxDynamicCast(child, wxRadioButton);
             // If a radiobutton is the first focusable child, search for the
             // selected radiobutton in the same group
             wxRadioButton* btn = wxDynamicCast(child, wxRadioButton);


@@ -663,13 +683,14 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
                 if (selected)
                     child = selected;
             }
                 if (selected)
                     child = selected;
             }

-#endif
+#endif // __WXMSW__

 
             wxLogTrace(TRACE_FOCUS,
                        _T("SetFocusToChild() => first child (0x%p)."),
                        child->GetHandle());
 
 
             wxLogTrace(TRACE_FOCUS,
                        _T("SetFocusToChild() => first child (0x%p)."),
                        child->GetHandle());
 

-            *childLastFocused = child;
+            if (childLastFocused)
+                *childLastFocused = child;

             child->SetFocusFromKbd();
             return true;
         }
             child->SetFocusFromKbd();
             return true;
         }


@@ -678,4 +699,3 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
     return false;
 }
 
     return false;
 }
 

-#endif // !wxHAS_NATIVE_TAB_TRAVERSAL