Build the new docs as part of the automated build

[wxWidgets.git] / utils / tex2rtf / src / texutils.cpp

diff --git a/utils/tex2rtf/src/texutils.cpp b/utils/tex2rtf/src/texutils.cpp
index 80a35b8ae258a09325aba1f084dea8229b8ed800..b4ad55afbba7e152753c5779b59316d90ef5806d 100644 (file)
--- a/utils/tex2rtf/src/texutils.cpp
+++ b/utils/tex2rtf/src/texutils.cpp
@@ -117,7 +117,7 @@ void OutputChunkToString(TexChunk *chunk, wxChar *buf)
       buf[i] = 0;
     else
     {
-      buf[i] = ch;
+      buf[i] = (wxChar)ch;
       i ++;
     }
   }
@@ -401,7 +401,7 @@ void WriteTexReferences(wxChar *filename)
   if (ostr.bad()) return;
   
   TexReferences.BeginFind();
-  wxNode *node = TexReferences.Next();
+  wxHashTable::Node *node = TexReferences.Next();
   while (node)
   {
     Tex2RTFYield();
@@ -449,7 +449,7 @@ void ReadTexReferences(wxChar *filename)
     if (!istr.eof())
     {
       istr >> file;
-         istr >> sectionName;
+      istr >> sectionName;
       char ch;
       istr.get(ch); // Read past space
       istr.get(ch);
@@ -494,7 +494,7 @@ void ReadTexReferences(wxChar *filename)
 
 void BibEatWhiteSpace(wxSTD istream& str)
 {
-  char ch = str.peek();
+  char ch = (char)str.peek();
   
   while (!str.eof() && (ch == ' ' || ch == '\t' || ch == 13 || ch == 10 || ch == EOF))
   {
@@ -502,18 +502,18 @@ void BibEatWhiteSpace(wxSTD istream& str)
       BibLine ++;
     str.get(ch);
     if ((ch == EOF) || str.eof()) return;
-    ch = str.peek();
+    ch = (char)str.peek();
   }
 
   // Ignore end-of-line comments
   if (ch == '%' || ch == ';' || ch == '#')
   {
     str.get(ch);
-    ch = str.peek();
+    ch = (char)str.peek();
     while (ch != 10 && ch != 13 && !str.eof())
     {
       str.get(ch);
-      ch = str.peek();
+      ch = (char)str.peek();
     }
     BibEatWhiteSpace(str);
   }
@@ -524,14 +524,14 @@ void BibReadWord(wxSTD istream& istr, wxChar *buffer)
 {
   int i = 0;
   buffer[i] = 0;
-  char ch = istr.peek();
+  char ch = (char)istr.peek();
   while (!istr.eof() && ch != ' ' && ch != '{' && ch != '(' && ch != 13 && ch != 10 && ch != '\t' &&
          ch != ',' && ch != '=')
   {
     istr.get(ch);
     buffer[i] = ch;
     i ++;
-    ch = istr.peek();
+    ch = (char)istr.peek();
   }
   buffer[i] = 0;
 }
@@ -541,12 +541,12 @@ void BibReadToEOL(wxSTD istream& istr, wxChar *buffer)
 {
   int i = 0;
   buffer[i] = 0;
-  char ch = istr.peek();
+  char ch = (char)istr.peek();
   bool inQuotes = false;
   if (ch == '"')
   {
     istr.get(ch);
-    ch = istr.peek();
+    ch = (char)istr.peek();
     inQuotes = true;
   }
   // If in quotes, read white space too. If not,
@@ -558,7 +558,7 @@ void BibReadToEOL(wxSTD istream& istr, wxChar *buffer)
     istr.get(ch);
     buffer[i] = ch;
     i ++;
-    ch = istr.peek();
+    ch = (char)istr.peek();
   }
   if (ch == '"')
     istr.get(ch);
@@ -572,7 +572,7 @@ void BibReadValue(wxSTD istream& istr, wxChar *buffer, bool ignoreBraces = true,
   int braceCount = 1;
   int i = 0;
   buffer[i] = 0;
-  char ch = istr.peek();
+  char ch = (char)istr.peek();
   bool stopping = false;
   while (!istr.eof() && !stopping)
   {
@@ -1627,15 +1627,15 @@ void Tex2RTFYield(bool force)
     static int yieldCount = 0;
     
     if (isSync)
-       return;
+        return;
     
     if (force)
-       yieldCount = 0;
+    yieldCount = 0;
     if (yieldCount == 0)
     {
-       if (wxTheApp)
-           wxYield();
-       yieldCount = 10;
+        if (wxTheApp)
+            wxYield();
+        yieldCount = 10;
     }
     yieldCount --;
 #endif
@@ -1663,7 +1663,7 @@ void AddKeyWordForTopic(wxChar *topic, wxChar *entry, wxChar *filename)
 void ClearKeyWordTable(void)
 {
   TopicTable.BeginFind();
-  wxNode *node = TopicTable.Next();
+  wxHashTable::Node *node = TopicTable.Next();
   while (node)
   {
     TexTopic *texTopic = (TexTopic *)node->GetData();
@@ -1713,7 +1713,7 @@ wxChar *ConvertCase(wxChar *s)
 }
 
 #if !WXWIN_COMPATIBILITY_2
-// if substring is TRUE, search for str1 in str2
+// if substring is true, search for str1 in str2
 bool StringMatch(const wxChar *str1, const wxChar *str2, bool subString, 
                  bool exact)
 {