Applied patch 1037938 by Zbigniew Zagorski to fix Unicode build problems

in Tex2RTF HTML generation

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

diff --git a/utils/tex2rtf/src/htmlutil.cpp b/utils/tex2rtf/src/htmlutil.cpp
index 5b357eda1a7e5893c3993506ad621d3b75a47fa6..2ef296d460b396cfb4cfbc920cc8dd50a6dfa6f6 100644 (file)
--- a/utils/tex2rtf/src/htmlutil.cpp
+++ b/utils/tex2rtf/src/htmlutil.cpp
@@ -887,7 +887,7 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
                 int ch = getc(fd);
                 while (ch != EOF)
                 {
-                    putc(ch, Sections);
+                    wxPutc(ch, Sections);
                     ch = getc(fd);
                 }
                 fclose(fd);
@@ -1662,7 +1662,7 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
         int ch = getc(fd);
         while (ch != EOF)
         {
-          putc(ch, Titlepage);
+          wxPutc(ch, Titlepage);
           ch = getc(fd);
         }
         fclose(fd);
@@ -3075,7 +3075,7 @@ bool HTMLGo(void)
         int ch = getc(fd);
         while (ch != EOF)
         {
-          putc(ch, tmpTitle);
+          wxPutc(ch, tmpTitle);
           ch = getc(fd);
         }
         fclose(fd);

diff --git a/utils/tex2rtf/src/rtfutils.cpp b/utils/tex2rtf/src/rtfutils.cpp
index 24f498ad4092566297fae99d420a27f30a9f19d0..2c4ec17613264af6c94579065515fbc33c89341a 100644 (file)
--- a/utils/tex2rtf/src/rtfutils.cpp
+++ b/utils/tex2rtf/src/rtfutils.cpp
@@ -1931,7 +1931,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
           int ch = getc(fd);
           while (ch != EOF)
           {
-            putc(ch, Chapters);
+            wxPutc(ch, Chapters);
             ch = getc(fd);
           }
           fclose(fd);

diff --git a/utils/tex2rtf/src/xlputils.cpp b/utils/tex2rtf/src/xlputils.cpp
index b687adbf4531461759129aea54064335dcea807d..e29328aad19b91e4d0bc8d42938e9d8d21f5bb0b 100644 (file)
--- a/utils/tex2rtf/src/xlputils.cpp
+++ b/utils/tex2rtf/src/xlputils.cpp
@@ -434,7 +434,7 @@ void XLPOnMacro(int macroId, int no_args, bool start)
         int ch = getc(fd);
         while (ch != EOF)
         {
-          putc(ch, Chapters);
+          wxPutc(ch, Chapters);
           ch = getc(fd);
         }
         fclose(fd);