wxTheApp can't be assigned to, anyhow, so make ms_appInstance private and provide...

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

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index ea61df47e39e24e7437d80c7769129fd1995f89d..f695be633494eb9a769677886b1d77683b100be3 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -36,6 +36,10 @@
 
 #include "wx/containr.h"
 
 
 #include "wx/containr.h"
 

+#ifdef __WXMAC__
+    #include "wx/scrolbar.h"
+#endif
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // 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
         // 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;
 
         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
 
     // 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
 
     // 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
         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
     {


@@ -220,7 +224,7 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
         }
         else
         {
         }
         else
         {

-            start_node = (wxWindowList::Node *)NULL;
+            start_node = wxWindowList::compatibility_iterator();

         }
 
         if ( !start_node && m_winLastFocused )
         }
 
         if ( !start_node && m_winLastFocused )


@@ -409,7 +413,7 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
     }
 
     // set the focus to the first child who wants it
     }
 
     // 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();
     while ( node )
     {
         wxWindow *child = node->GetData();