Implement wxBitmapButton::DoGetBestSize() to call wxButtonBase version so

[wxWidgets.git] / utils / tex2rtf / src / htmlutil.cpp
diff --git a/utils/tex2rtf/src/htmlutil.cpp b/utils/tex2rtf/src/htmlutil.cpp

index c3233630b791dbeefbee1d08d9db5b6442659d5e..2ef296d460b396cfb4cfbc920cc8dd50a6dfa6f6 100644 (file)
--- a/utils/tex2rtf/src/htmlutil.cpp
+++ b/utils/tex2rtf/src/htmlutil.cpp
@@ -874,6 +874,8 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
  
            if ( combineSubSections && !subsectionStarted )
            {
+            fflush(Sections);
+              
              // Read old .con file in at this point
              wxChar buf[256];
              wxStrcpy(buf, CurrentSectionFile);
@@ -885,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);
@@ -1649,16 +1651,22 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
    {
      if (start)
      {
+      // NB: if this is uncommented, the table of contents
+      // completely disappears. If left commented, it's in the wrong
+      // place.
+      //fflush(Titlepage);
+
        FILE *fd = wxFopen(ContentsName, _T("r"));
        if (fd)
        {
          int ch = getc(fd);
          while (ch != EOF)
          {
-          putc(ch, Titlepage);
+          wxPutc(ch, Titlepage);
            ch = getc(fd);
          }
          fclose(fd);
+        fflush(Titlepage);
        }
        else
        {
@@ -3024,7 +3032,7 @@ bool HTMLGo(void)
        {
          SetCurrentOutput(tmpTitle);
          HTMLHead();
-        TexOutput(_T("\n<HEAD><TITLE>"));
+        TexOutput(_T("\n<TITLE>"));
          TraverseChildrenFromChunk(DocumentTitle);
          TexOutput(_T("</TITLE></HEAD>\n"));
        }
@@ -3058,6 +3066,7 @@ bool HTMLGo(void)
  
        // Output <BODY...> to temporary title page
        OutputBodyStart();
+      fflush(tmpTitle);
  
        // Concat titlepage
        FILE *fd = wxFopen(TitlepageName, _T("r"));
@@ -3066,7 +3075,7 @@ bool HTMLGo(void)
          int ch = getc(fd);
          while (ch != EOF)
          {
-          putc(ch, tmpTitle);
+          wxPutc(ch, tmpTitle);
            ch = getc(fd);
          }
          fclose(fd);