wxWindowsPrinter::Print ignored the "All pages" option, instead it was using the...

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

diff --git a/utils/tex2rtf/src/texutils.cpp b/utils/tex2rtf/src/texutils.cpp
index be0c83a28cfa969a989cf6b8b790854d05c27d9e..30ce714099c7015d176f7dba89314a70c98a4395 100644 (file)
--- a/utils/tex2rtf/src/texutils.cpp
+++ b/utils/tex2rtf/src/texutils.cpp
@@ -21,7 +21,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/wx.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/hash.h"
 #endif
 
 #include "wx/hash.h"


@@ -42,6 +42,16 @@ using namespace std;
 #include <ctype.h>
 #include "tex2any.h"
 
 #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;
 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();
       }
           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 : 
    }
    else
       return exact ? wxString(str2).Cmp(str1) == 0 :