X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..e41e579f40ec15c8c20aa3118b7367281ae4f95b:/utils/tex2rtf/src/texutils.cpp

diff --git a/utils/tex2rtf/src/texutils.cpp b/utils/tex2rtf/src/texutils.cpp
index be0c83a28c..30ce714099 100644
--- a/utils/tex2rtf/src/texutils.cpp
+++ b/utils/tex2rtf/src/texutils.cpp
@@ -21,7 +21,7 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/wx.h"
+    #include "wx/log.h"
 #endif
 
 #include "wx/hash.h"
@@ -42,6 +42,16 @@ using namespace std;
 #include <ctype.h>
 #include "tex2any.h"
 
+#if !WXWIN_COMPATIBILITY_2_4
+static inline wxChar* copystring(const wxChar* s)
+    { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
+static inline void StringToInt (const wxChar *s, int *number)
+{
+  if (s && *s && number)
+    *number = (int) wxStrtol (s, (wxChar **) NULL, 10);
+}
+#endif
+
 wxHashTable TexReferences(wxKEY_STRING);
 wxList BibList(wxKEY_STRING);
 wxStringList CitationList;
@@ -1687,7 +1697,7 @@ bool StringMatch(const wxChar *str1, const wxChar *str2, bool subString,
           Sstr1.MakeUpper();
           Sstr2.MakeUpper();
       }
-      return Sstr2.Index(Sstr1) != wxNOT_FOUND;
+      return Sstr2.Index(Sstr1) != (size_t)wxNOT_FOUND;
    }
    else
       return exact ? wxString(str2).Cmp(str1) == 0 :