X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce045aed585af0f00b72f1cdba893b47ac2e0e55..35bb3cb155917b4287fb2a3841bea22919a3d499:/utils/tex2rtf/src/rtfutils.cpp?ds=inline diff --git a/utils/tex2rtf/src/rtfutils.cpp b/utils/tex2rtf/src/rtfutils.cpp index 6dc426cdba..5f59fea4e3 100644 --- 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 {