fixed wxMOUSE_BTN_XXX values, use them instead of hard coded constants

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

diff --git a/utils/tex2rtf/src/rtfutils.cpp b/utils/tex2rtf/src/rtfutils.cpp
index e4e08c30bbefe225afceff8783fbed389dbd835a..ef7a7456831653502282a47d077e486c93a811f3 100644 (file)
--- a/utils/tex2rtf/src/rtfutils.cpp
+++ b/utils/tex2rtf/src/rtfutils.cpp
@@ -21,7 +21,6 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/wx.h"
 #endif
 
 #include "tex2any.h"
@@ -37,6 +36,11 @@
 #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;
 static int forbidParindent = 0; // if > 0, no parindent (e.g. in center environment)
@@ -243,7 +247,6 @@ void WriteWinHelpContentsFileLine(char *topicName, char *xitle, int level)
                  char ch1=xitle[s+1]&0xff;
                  char ch2=xitle[s+2]&0xff;
                  char ch3=xitle[s+3]&0xff;
-                 char ch4=xitle[s+4]&0xff;
                  s+=4; // next character                 
                  char a=0;
                  if ((ch1==0x27)&&(ch2==0x66)&&(ch3==0x36)) { title[d++]='ö';  a=1; }
@@ -3366,7 +3369,6 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
                 {
                   if (useWord)
                   {
-                      char *s = GetArgData();
                       TexOutput("p. ");
                       TexOutput("{\\field{\\*\\fldinst  PAGEREF ");
                       TexOutput(refName);
@@ -3618,7 +3620,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
               }
               else
               {
-                sprintf(buf, "Could not read metafile %s. Perhaps it's not a placeable metafile?", f);
+                sprintf(buf, "Could not read metafile %s. Perhaps it's not a placeable metafile?", (const char*)f);
                 OnError(buf);
               }
               fclose(fd);