TeX2RTF compilation fixes after my last wxHashTable changes.

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

diff --git a/utils/tex2rtf/src/htmlutil.cpp b/utils/tex2rtf/src/htmlutil.cpp
index cc8187395f09bf4d45649477ebb025b76ad8495a..1e8def80c6e9132d801784a0696695b044c1001b 100644 (file)
--- a/utils/tex2rtf/src/htmlutil.cpp
+++ b/utils/tex2rtf/src/htmlutil.cpp
@@ -3123,7 +3123,7 @@ void GenerateHTMLIndexFile(wxChar *fname)
     return;
 
   TopicTable.BeginFind();
     return;
 
   TopicTable.BeginFind();

-  wxNode *node = TopicTable.Next();
+  wxHashTable::Node *node = TopicTable.Next();

   while (node)
   {
     TexTopic *texTopic = (TexTopic *)node->GetData();
   while (node)
   {
     TexTopic *texTopic = (TexTopic *)node->GetData();


@@ -3223,7 +3223,7 @@ void GenerateHTMLWorkshopFiles(wxChar *fname)
       _T("<UL>\n"));
 
   TopicTable.BeginFind();
       _T("<UL>\n"));
 
   TopicTable.BeginFind();

-  wxNode *node = TopicTable.Next();
+  wxHashTable::Node *node = TopicTable.Next();

   while (node)
   {
     TexTopic *texTopic = (TexTopic *)node->GetData();
   while (node)
   {
     TexTopic *texTopic = (TexTopic *)node->GetData();

diff --git a/utils/tex2rtf/src/tex2any.cpp b/utils/tex2rtf/src/tex2any.cpp
index b7e06231a7fbe651097ac2a969dd4d181948f787..8bb9b7342f3ff79a8c13338435fd316e5318352f 100644 (file)
--- a/utils/tex2rtf/src/tex2any.cpp
+++ b/utils/tex2rtf/src/tex2any.cpp
@@ -2056,22 +2056,22 @@ void TexCleanUp(void)
   }
 /**/
   TexReferences.BeginFind();
   }
 /**/
   TexReferences.BeginFind();

-  wxNode *node = TexReferences.Next();
-  while (node)
+  wxHashTable::Node *refNode = TexReferences.Next();
+  while (refNode)

   {
   {

-    TexRef *ref = (TexRef *)node->GetData();
+    TexRef *ref = (TexRef *)refNode->GetData();

     delete ref;
     delete ref;

-    node = TexReferences.Next();
+    refNode = TexReferences.Next();

   }
   TexReferences.Clear();
   
   }
   TexReferences.Clear();
   

-  node = BibList.GetFirst();
-  while (node)
+  wxNode* bibNode = BibList.GetFirst();
+  while (bibNode)

   {
   {

-    BibEntry *entry = (BibEntry *)node->GetData();
+    BibEntry *entry = (BibEntry *)bibNode->GetData();

     delete entry;
     delete entry;

-    delete node;
-    node = BibList.GetFirst();
+    delete bibNode;
+    bibNode = BibList.GetFirst();

   }
   CitationList.Clear();
   ResetTopicCounter();
   }
   CitationList.Clear();
   ResetTopicCounter();

diff --git a/utils/tex2rtf/src/tex2rtf.cpp b/utils/tex2rtf/src/tex2rtf.cpp
index 464dc6656ef988681d3d8a0b1278440c0961ffe1..f760e4cd0b91305124adf2120822ec105cbf43cc 100644 (file)
--- a/utils/tex2rtf/src/tex2rtf.cpp
+++ b/utils/tex2rtf/src/tex2rtf.cpp
@@ -432,12 +432,12 @@ int MyApp::OnExit()
     node = CustomMacroList.GetFirst();
   }
   MacroDefs.BeginFind();
     node = CustomMacroList.GetFirst();
   }
   MacroDefs.BeginFind();

-  node = MacroDefs.Next();
-  while (node)
+  wxHashTable::Node* mNode = MacroDefs.Next();
+  while (mNode)

   {
   {

-    TexMacroDef* def = (TexMacroDef*) node->GetData();
+    TexMacroDef* def = (TexMacroDef*) mNode->GetData();

     delete def;
     delete def;

-    node = MacroDefs.Next();
+    mNode = MacroDefs.Next();

   }
   MacroDefs.Clear();
 #ifdef __WXMSW__
   }
   MacroDefs.Clear();
 #ifdef __WXMSW__

diff --git a/utils/tex2rtf/src/texutils.cpp b/utils/tex2rtf/src/texutils.cpp
index 80a35b8ae258a09325aba1f084dea8229b8ed800..70f3eec1c759f278d61015b36ade7138c43de02b 100644 (file)
--- a/utils/tex2rtf/src/texutils.cpp
+++ b/utils/tex2rtf/src/texutils.cpp
@@ -401,7 +401,7 @@ void WriteTexReferences(wxChar *filename)
   if (ostr.bad()) return;
   
   TexReferences.BeginFind();
   if (ostr.bad()) return;
   
   TexReferences.BeginFind();

-  wxNode *node = TexReferences.Next();
+  wxHashTable::Node *node = TexReferences.Next();

   while (node)
   {
     Tex2RTFYield();
   while (node)
   {
     Tex2RTFYield();


@@ -1663,7 +1663,7 @@ void AddKeyWordForTopic(wxChar *topic, wxChar *entry, wxChar *filename)
 void ClearKeyWordTable(void)
 {
   TopicTable.BeginFind();
 void ClearKeyWordTable(void)
 {
   TopicTable.BeginFind();

-  wxNode *node = TopicTable.Next();
+  wxHashTable::Node *node = TopicTable.Next();

   while (node)
   {
     TexTopic *texTopic = (TexTopic *)node->GetData();
   while (node)
   {
     TexTopic *texTopic = (TexTopic *)node->GetData();