Compilation fix for Watcom (on OS/2).

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

diff --git a/utils/tex2rtf/src/rtfutils.cpp b/utils/tex2rtf/src/rtfutils.cpp
index 6dc426cdba6b2b9fbf70ec44cedab80abfa04cb6..5f59fea4e31a74fdc4547fa710158615c163a514 100644 (file)
--- a/utils/tex2rtf/src/rtfutils.cpp
+++ b/utils/tex2rtf/src/rtfutils.cpp
@@ -33,10 +33,8 @@
 #include "bmputils.h"
 #include "table.h"
 
-#if !WXWIN_COMPATIBILITY_2_4
 static inline wxChar* copystring(const wxChar* s)
     { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
-#endif
 
 wxList itemizeStack;
 static int indentLevel = 0;
@@ -3554,7 +3552,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       if(tok.HasMoreTokens())
       {
         wxString token = tok.GetNextToken();
-        imageWidth = (int)(20*ParseUnitArgument((wxChar*)token.c_str()));
+        imageWidth = (int)(20*ParseUnitArgument(token));
       }
       else
       {
@@ -3565,7 +3563,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       if(tok.HasMoreTokens())
       {
         wxString token = tok.GetNextToken();
-        imageHeight = (int)(20*ParseUnitArgument((wxChar*)token.c_str()));
+        imageHeight = (int)(20*ParseUnitArgument(token));
       }
       else
       {