updated source to not use deprecated wxList methods

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index 48b2c379c82b09d37a907b4eabcdd63b10c74e2b..b100ef0b8c61602de2ecc58b4d880eeb9db54732 100644 (file)
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -1232,14 +1232,14 @@ void wxWakeUpIdle()
 bool wxApp::SendIdleEvents()
 {
     bool needMore = FALSE;
 bool wxApp::SendIdleEvents()
 {
     bool needMore = FALSE;

-    wxNode* node = wxTopLevelWindows.First();
+    wxWindowListNode* node = wxTopLevelWindows.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxWindow* win = (wxWindow*) node->Data();
+        wxWindow* win = node->GetData();

         if (SendIdleEvents(win))
             needMore = TRUE;
 
         if (SendIdleEvents(win))
             needMore = TRUE;
 

-        node = node->Next();
+        node = node->GetNext();

     }
     return needMore;
 }
     }
     return needMore;
 }


@@ -1256,24 +1256,24 @@ bool wxApp::SendIdleEvents(wxWindow* win)
     if (event.MoreRequested())
         needMore = TRUE;
 
     if (event.MoreRequested())
         needMore = TRUE;
 

-    wxNode* node = win->GetChildren().First();
+    wxWindowListNode* node = win->GetChildren().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxWindow* win = (wxWindow*) node->Data();
+        wxWindow* win = node->GetData();

         if (SendIdleEvents(win))
             needMore = TRUE;
 
         if (SendIdleEvents(win))
             needMore = TRUE;
 

-        node = node->Next();
+        node = node->GetNext();

     }
     return needMore ;
 }
 
 void wxApp::DeletePendingObjects()
 {
     }
     return needMore ;
 }
 
 void wxApp::DeletePendingObjects()
 {

-  wxNode *node = wxPendingDelete.First();
+  wxNode *node = wxPendingDelete.GetFirst();

   while (node)
   {
   while (node)
   {

-    wxObject *obj = (wxObject *)node->Data();
+    wxObject *obj = (wxObject *)node->GetData();

 
     delete obj;
 
 
     delete obj;
 


@@ -1282,7 +1282,7 @@ void wxApp::DeletePendingObjects()
 
     // Deleting one object may have deleted other pending
     // objects, so start from beginning of list again.
 
     // Deleting one object may have deleted other pending
     // objects, so start from beginning of list again.

-    node = wxPendingDelete.First();
+    node = wxPendingDelete.GetFirst();

   }
 }
 
   }
 }
 


@@ -1394,13 +1394,13 @@ void wxApp::MacSuspend( bool convertClipboard )
 #if !TARGET_CARBON
     // we have to deactive the top level windows manually
 
 #if !TARGET_CARBON
     // we have to deactive the top level windows manually
 

-    wxNode* node = wxTopLevelWindows.First();
+    wxWindowListNode* node = wxTopLevelWindows.GetFirst();

     while (node)
     {
         wxTopLevelWindow* win = (wxTopLevelWindow*) node->Data();
         win->MacActivate( ((EventRecord*) MacGetCurrentEvent())->when , false ) ;
 
     while (node)
     {
         wxTopLevelWindow* win = (wxTopLevelWindow*) node->Data();
         win->MacActivate( ((EventRecord*) MacGetCurrentEvent())->when , false ) ;
 

-        node = node->Next();
+        node = node->GetNext();

     }
 
     ::HideFloatingWindows() ;
     }
 
     ::HideFloatingWindows() ;


@@ -1427,13 +1427,13 @@ void wxApp::MacResume( bool convertClipboard )
     ::ShowFloatingWindows() ;
     // raise modal dialogs in case a non modal window was selected to activate the app
 
     ::ShowFloatingWindows() ;
     // raise modal dialogs in case a non modal window was selected to activate the app
 

-    wxNode* node = wxModalDialogs.First();
+    wxNode* node = wxModalDialogs.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxDialog* dialog = (wxDialog *) node->Data();
+        wxDialog* dialog = (wxDialog *) node->GetData();

         dialog->Raise();
 
         dialog->Raise();
 

-        node = node->Next();
+        node = node->GetNext();

     }
 #endif
 }
     }
 #endif
 }


@@ -2388,4 +2388,4 @@ void wxApp::MacHandleMenuSelect( int macMenuId , int macMenuItemNum )
     }
     HiliteMenu(0);
 }
     }
     HiliteMenu(0);
 }

-#endif
\ No newline at end of file
+#endif

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 48b2c379c82b09d37a907b4eabcdd63b10c74e2b..b100ef0b8c61602de2ecc58b4d880eeb9db54732 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -1232,14 +1232,14 @@ void wxWakeUpIdle()
 bool wxApp::SendIdleEvents()
 {
     bool needMore = FALSE;
 bool wxApp::SendIdleEvents()
 {
     bool needMore = FALSE;

-    wxNode* node = wxTopLevelWindows.First();
+    wxWindowListNode* node = wxTopLevelWindows.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxWindow* win = (wxWindow*) node->Data();
+        wxWindow* win = node->GetData();

         if (SendIdleEvents(win))
             needMore = TRUE;
 
         if (SendIdleEvents(win))
             needMore = TRUE;
 

-        node = node->Next();
+        node = node->GetNext();

     }
     return needMore;
 }
     }
     return needMore;
 }


@@ -1256,24 +1256,24 @@ bool wxApp::SendIdleEvents(wxWindow* win)
     if (event.MoreRequested())
         needMore = TRUE;
 
     if (event.MoreRequested())
         needMore = TRUE;
 

-    wxNode* node = win->GetChildren().First();
+    wxWindowListNode* node = win->GetChildren().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxWindow* win = (wxWindow*) node->Data();
+        wxWindow* win = node->GetData();

         if (SendIdleEvents(win))
             needMore = TRUE;
 
         if (SendIdleEvents(win))
             needMore = TRUE;
 

-        node = node->Next();
+        node = node->GetNext();

     }
     return needMore ;
 }
 
 void wxApp::DeletePendingObjects()
 {
     }
     return needMore ;
 }
 
 void wxApp::DeletePendingObjects()
 {

-  wxNode *node = wxPendingDelete.First();
+  wxNode *node = wxPendingDelete.GetFirst();

   while (node)
   {
   while (node)
   {

-    wxObject *obj = (wxObject *)node->Data();
+    wxObject *obj = (wxObject *)node->GetData();

 
     delete obj;
 
 
     delete obj;
 


@@ -1282,7 +1282,7 @@ void wxApp::DeletePendingObjects()
 
     // Deleting one object may have deleted other pending
     // objects, so start from beginning of list again.
 
     // Deleting one object may have deleted other pending
     // objects, so start from beginning of list again.

-    node = wxPendingDelete.First();
+    node = wxPendingDelete.GetFirst();

   }
 }
 
   }
 }
 


@@ -1394,13 +1394,13 @@ void wxApp::MacSuspend( bool convertClipboard )
 #if !TARGET_CARBON
     // we have to deactive the top level windows manually
 
 #if !TARGET_CARBON
     // we have to deactive the top level windows manually
 

-    wxNode* node = wxTopLevelWindows.First();
+    wxWindowListNode* node = wxTopLevelWindows.GetFirst();

     while (node)
     {
         wxTopLevelWindow* win = (wxTopLevelWindow*) node->Data();
         win->MacActivate( ((EventRecord*) MacGetCurrentEvent())->when , false ) ;
 
     while (node)
     {
         wxTopLevelWindow* win = (wxTopLevelWindow*) node->Data();
         win->MacActivate( ((EventRecord*) MacGetCurrentEvent())->when , false ) ;
 

-        node = node->Next();
+        node = node->GetNext();

     }
 
     ::HideFloatingWindows() ;
     }
 
     ::HideFloatingWindows() ;


@@ -1427,13 +1427,13 @@ void wxApp::MacResume( bool convertClipboard )
     ::ShowFloatingWindows() ;
     // raise modal dialogs in case a non modal window was selected to activate the app
 
     ::ShowFloatingWindows() ;
     // raise modal dialogs in case a non modal window was selected to activate the app
 

-    wxNode* node = wxModalDialogs.First();
+    wxNode* node = wxModalDialogs.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxDialog* dialog = (wxDialog *) node->Data();
+        wxDialog* dialog = (wxDialog *) node->GetData();

         dialog->Raise();
 
         dialog->Raise();
 

-        node = node->Next();
+        node = node->GetNext();

     }
 #endif
 }
     }
 #endif
 }


@@ -2388,4 +2388,4 @@ void wxApp::MacHandleMenuSelect( int macMenuId , int macMenuItemNum )
     }
     HiliteMenu(0);
 }
     }
     HiliteMenu(0);
 }

-#endif
\ No newline at end of file
+#endif