From 1e8774da27c314ac8076ae3694be134d773a0573 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Tue, 23 Aug 2005 23:19:20 +0000 Subject: [PATCH] [tex2rtf] Remove wxWidgets-2.0 compatibility guards git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/tex2rtf/src/tex2any.h | 2 -- utils/tex2rtf/src/texutils.cpp | 2 -- 2 files changed, 4 deletions(-) diff --git a/utils/tex2rtf/src/tex2any.h b/utils/tex2rtf/src/tex2any.h index 5a0ba50e94..19cd343518 100644 --- a/utils/tex2rtf/src/tex2any.h +++ b/utils/tex2rtf/src/tex2any.h @@ -173,9 +173,7 @@ int GetCurrentColumn(void); // number of characters on current line wxChar *ConvertCase(wxChar *s); // Convert case, according to upperCaseNames setting. extern wxPathList TexPathList; // Path list, can be used for file searching. -#if !WXWIN_COMPATIBILITY_2 extern bool StringMatch(const wxChar *one, const wxChar *two, bool subString = true, bool exact = false); -#endif // Define a variable value from the .ini file wxChar *RegisterSetting(wxChar *settingName, wxChar *settingValue, bool interactive = true); diff --git a/utils/tex2rtf/src/texutils.cpp b/utils/tex2rtf/src/texutils.cpp index d53d63f783..494036b5d0 100644 --- a/utils/tex2rtf/src/texutils.cpp +++ b/utils/tex2rtf/src/texutils.cpp @@ -1722,7 +1722,6 @@ wxChar *ConvertCase(wxChar *s) return buf; } -#if !WXWIN_COMPATIBILITY_2 // if substring is true, search for str1 in str2 bool StringMatch(const wxChar *str1, const wxChar *str2, bool subString, bool exact) @@ -1742,4 +1741,3 @@ bool StringMatch(const wxChar *str1, const wxChar *str2, bool subString, return exact ? wxString(str2).Cmp(str1) == 0 : wxString(str2).CmpNoCase(str1) == 0; } -#endif -- 2.45.2