wxFrameNameStr was already delivered by #include one line earlier.

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

diff --git a/utils/tex2rtf/src/readshg.cpp b/utils/tex2rtf/src/readshg.cpp
index a7454b736c544639c5cd6dad2157f62a8d270e9b..3d5cc5ee1229759b0fdca01718f4b3850b1ace9a 100644 (file)
--- a/utils/tex2rtf/src/readshg.cpp
+++ b/utils/tex2rtf/src/readshg.cpp
@@ -6,17 +6,14 @@
 //              reverse-engineering
 //              and guesswork at its best.
 // Author:      Petr Smilauer
-// Modified by:
+// Modified by: Wlodzimiez ABX Skiba 2003/2004 Unicode support
+//              Ron Lee
 // Created:     01/01/99
 // RCS-ID:      $Id$
 // Copyright:   (c) Petr Smilauer
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -89,7 +86,7 @@ int   ParseSHG( const wxChar* fileName, HotSpot **hotspots)
   if(nMacroStrings > 0)
     fseek( fSHG, nMacroStrings, SEEK_CUR);  //nMacroStrings is byte offset...
   // and, at the last, read through the strings: hotspot-id[ignored], then topic/macro
-  int  c;
+  int c;
   for( i = 0 ; i < nHotspots ; ++i)
   {
     while( (c = fgetc( fSHG)) != 0)
@@ -98,7 +95,7 @@ int   ParseSHG( const wxChar* fileName, HotSpot **hotspots)
     int j = 0;
     while( (c = fgetc( fSHG)) != 0)
     {
-      (*hotspots)[i].szHlpTopic_Macro[j] = c;
+      (*hotspots)[i].szHlpTopic_Macro[j] = (wxChar)c;
       ++j;
     }
     (*hotspots)[i].szHlpTopic_Macro[j] = 0;
@@ -116,10 +113,10 @@ bool SHGToMap(wxChar *filename, wxChar *defaultFile)
   HotSpot *hotspots = NULL;
   int n = ParseSHG(filename, &hotspots);
   if (n == 0)
-    return FALSE;
+    return false;
 
   wxChar buf[100];
-  wxSprintf(buf, _T("Converting .SHG file to HTML map file: there are %d hotspots in %s."), n, filename);
+  wxSnprintf(buf, sizeof(buf), _T("Converting .SHG file to HTML map file: there are %d hotspots in %s."), n, filename);
   OnInform(buf);
 
   wxChar outBuf[256];
@@ -132,7 +129,7 @@ bool SHGToMap(wxChar *filename, wxChar *defaultFile)
   {
     OnError(_T("Could not open .map file for writing."));
     delete[] hotspots;
-    return FALSE;
+    return false;
   }
 
   wxFprintf(fd, _T("default %s\n"), defaultFile);
@@ -146,7 +143,7 @@ bool SHGToMap(wxChar *filename, wxChar *defaultFile)
     else
     {
       wxChar buf[300];
-      wxSprintf(buf, _T("Warning: could not find hotspot reference %s"), hotspots[i].szHlpTopic_Macro);
+      wxSnprintf(buf, sizeof(buf), _T("Warning: could not find hotspot reference %s"), hotspots[i].szHlpTopic_Macro);
       OnInform(buf);
     }
     wxFprintf(fd, _T("rect %s %d %d %d %d\n"), refFilename, (int)hotspots[i].left, (int)hotspots[i].top,
@@ -157,6 +154,6 @@ bool SHGToMap(wxChar *filename, wxChar *defaultFile)
   fclose(fd);
 
   delete[] hotspots;
-  return TRUE;
+  return true;
 }