removed tests for WXWIN_COMPATIBILITY_2_4

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

diff --git a/utils/tex2rtf/src/readshg.cpp b/utils/tex2rtf/src/readshg.cpp
index 6d3ffaff2bb8ba3850da51c996e04e6e901b3e94..3d5cc5ee1229759b0fdca01718f4b3850b1ace9a 100644 (file)
--- a/utils/tex2rtf/src/readshg.cpp
+++ b/utils/tex2rtf/src/readshg.cpp
@@ -14,10 +14,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -90,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
   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)
   for( i = 0 ; i < nHotspots ; ++i)
   {
     while( (c = fgetc( fSHG)) != 0)


@@ -99,7 +95,7 @@ int   ParseSHG( const wxChar* fileName, HotSpot **hotspots)
     int j = 0;
     while( (c = fgetc( fSHG)) != 0)
     {
     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;
       ++j;
     }
     (*hotspots)[i].szHlpTopic_Macro[j] = 0;