Warning fixes from ABX

[wxWidgets.git] / contrib / src / fl / garbagec.cpp

diff --git a/contrib/src/fl/garbagec.cpp b/contrib/src/fl/garbagec.cpp
index 993da58553614021f17b1c026d7c795b611ca09a..7f690b27f5ad7fa2854992bb5a5420a634069447 100644 (file)
--- a/contrib/src/fl/garbagec.cpp
+++ b/contrib/src/fl/garbagec.cpp
@@ -32,7 +32,7 @@
 
 inline static GCItem& node_to_item( wxNode* pNode )
 {
 
 inline static GCItem& node_to_item( wxNode* pNode )
 {

-    return *( (GCItem*)(pNode->Data()) );
+    return *( (GCItem*)(pNode->GetData()) );

 }
 
 GarbageCollector::~GarbageCollector()
 }
 
 GarbageCollector::~GarbageCollector()


@@ -44,13 +44,13 @@ GarbageCollector::~GarbageCollector()
 
 void GarbageCollector::DestroyItemList( wxList& lst )
 {
 
 void GarbageCollector::DestroyItemList( wxList& lst )
 {

-    wxNode* pNode = lst.First();
+    wxNode* pNode = lst.GetFirst();

 
     while( pNode )
     {
         delete &node_to_item( pNode );
 
 
     while( pNode )
     {
         delete &node_to_item( pNode );
 

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

     }
 
     lst.Clear();
     }
 
     lst.Clear();


@@ -58,7 +58,7 @@ void GarbageCollector::DestroyItemList( wxList& lst )
 
 wxNode* GarbageCollector::FindItemNode( void* pForObj )
 {
 
 wxNode* GarbageCollector::FindItemNode( void* pForObj )
 {

-    wxNode* pNode = mAllNodes.First();
+    wxNode* pNode = mAllNodes.GetFirst();

 
     while( pNode )
     {
 
     while( pNode )
     {


@@ -66,7 +66,7 @@ wxNode* GarbageCollector::FindItemNode( void* pForObj )
 
             return pNode;
 
 
             return pNode;
 

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

     }
 
     int avoidCompilerWarning = 0;
     }
 
     int avoidCompilerWarning = 0;


@@ -77,15 +77,15 @@ wxNode* GarbageCollector::FindItemNode( void* pForObj )
 
 wxNode* GarbageCollector::FindReferenceFreeItemNode()
 {
 
 wxNode* GarbageCollector::FindReferenceFreeItemNode()
 {

-    wxNode* pNode = mAllNodes.First();
+    wxNode* pNode = mAllNodes.GetFirst();

 
     while( pNode )
     {
 
     while( pNode )
     {

-        if ( node_to_item( pNode ).mRefs.Number() == 0 ) 
+        if ( node_to_item( pNode ).mRefs.GetCount() == 0 ) 

 
             return pNode;
 
 
             return pNode;
 

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

     }
 
     return 0;
     }
 
     return 0;


@@ -93,18 +93,18 @@ wxNode* GarbageCollector::FindReferenceFreeItemNode()
 
 void GarbageCollector::RemoveReferencesToNode( wxNode* pItemNode )
 {
 
 void GarbageCollector::RemoveReferencesToNode( wxNode* pItemNode )
 {

-    wxNode* pNode = mAllNodes.First();
+    wxNode* pNode = mAllNodes.GetFirst();

 
     while( pNode )
     {
         wxList& refLst   = node_to_item( pNode ).mRefs;
 
     while( pNode )
     {
         wxList& refLst   = node_to_item( pNode ).mRefs;

-        wxNode* pRefNode = refLst.First();
+        wxNode* pRefNode = refLst.GetFirst();

 
         while( pRefNode )
         {
 
         while( pRefNode )
         {

-            if ( pRefNode->Data() == (wxObject*)pItemNode )
+            if ( pRefNode->GetData() == (wxObject*)pItemNode )

             {
             {

-                wxNode* pNext = pRefNode->Next();
+                wxNode* pNext = pRefNode->GetNext();

 
                 refLst.DeleteNode( pRefNode );
 
 
                 refLst.DeleteNode( pRefNode );
 


@@ -112,35 +112,35 @@ void GarbageCollector::RemoveReferencesToNode( wxNode* pItemNode )
 
                 continue;
             }
 
                 continue;
             }

-            else pRefNode = pRefNode->Next();
+            else pRefNode = pRefNode->GetNext();

         }
 
         }
 

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

     }
 }
 
 void GarbageCollector::ResolveReferences()
 {
     }
 }
 
 void GarbageCollector::ResolveReferences()
 {

-    wxNode* pNode = mAllNodes.First();
+    wxNode* pNode = mAllNodes.GetFirst();

 
     while( pNode )
     {
         GCItem& item = node_to_item( pNode );
 
 
     while( pNode )
     {
         GCItem& item = node_to_item( pNode );
 

-        wxNode* pRefNode = item.mRefs.First();
+        wxNode* pRefNode = item.mRefs.GetFirst();

 
         while( pRefNode )
         {
 
         while( pRefNode )
         {

-            pRefNode->SetData( (wxObject*) FindItemNode( (void*)pRefNode->Data() ) );
+            pRefNode->SetData( (wxObject*) FindItemNode( (void*)pRefNode->GetData() ) );

 
 

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

         }
 
         }
 

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

     }
 }
 
     }
 }
 

-void GarbageCollector::AddObject( void* pObj, int refCnt )
+void GarbageCollector::AddObject( void* pObj, int WXUNUSED(refCnt) )

 {
     // FOR NOW:: initial ref-count is not used
 
 {
     // FOR NOW:: initial ref-count is not used
 


@@ -173,7 +173,7 @@ void GarbageCollector::ArrangeCollection()
             // append it to the list, where items are contained
             // in the increasing order of dependencies
 
             // append it to the list, where items are contained
             // in the increasing order of dependencies
 

-            mRegularLst.Append( pItemNode->Data() );
+            mRegularLst.Append( pItemNode->GetData() );

 
             mAllNodes.DeleteNode( pItemNode );
 
 
             mAllNodes.DeleteNode( pItemNode );
 


@@ -187,13 +187,13 @@ void GarbageCollector::ArrangeCollection()
             // otherwise, what is left - all nodes, which
             // are involved into cycled chains (rings)
 
             // otherwise, what is left - all nodes, which
             // are involved into cycled chains (rings)
 

-            wxNode* pNode = mAllNodes.First();
+            wxNode* pNode = mAllNodes.GetFirst();

 
             while( pNode )
             {
 
             while( pNode )
             {

-                mCycledLst.Append( pNode->Data() );
+                mCycledLst.Append( pNode->GetData() );

 
 

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

             }
 
             mAllNodes.Clear();
             }
 
             mAllNodes.Clear();