compilation fix for wxStrspn and wxStrcspn: WX_STR_FUNC should be used after all...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h
index 815cbd2a1233401b8ab33c5472447692d2a36762..04b5fa6e4d30d36b9c15f5072c044facf2f73b0b 100644 (file)
--- a/include/wx/wxcrt.h
+++ b/include/wx/wxcrt.h
@@ -453,8 +453,7 @@ inline size_t wxStrspn_String(const wxString& s1, const T& s2)
     size_t pos = s1.find_first_not_of(s2);
     return pos == wxString::npos ? s1.length() : pos;
 }
     size_t pos = s1.find_first_not_of(s2);
     return pos == wxString::npos ? s1.length() : pos;
 }

-WX_STR_FUNC_NO_INVERT(size_t, wxStrspn,
-                      wxCRT_StrspnA, wxCRT_StrspnW, wxStrspn_String)
+WX_STR_FUNC(size_t, wxStrspn, wxCRT_StrspnA, wxCRT_StrspnW, wxStrspn_String)

 
 template<typename T>
 inline size_t wxStrcspn_String(const wxString& s1, const T& s2)
 
 template<typename T>
 inline size_t wxStrcspn_String(const wxString& s1, const T& s2)


@@ -462,8 +461,7 @@ inline size_t wxStrcspn_String(const wxString& s1, const T& s2)
     size_t pos = s1.find_first_of(s2);
     return pos == wxString::npos ? s1.length() : pos;
 }
     size_t pos = s1.find_first_of(s2);
     return pos == wxString::npos ? s1.length() : pos;
 }

-WX_STR_FUNC_NO_INVERT(size_t, wxStrcspn,
-                      wxCRT_StrcspnA, wxCRT_StrcspnW, wxStrcspn_String)
+WX_STR_FUNC(size_t, wxStrcspn, wxCRT_StrcspnA, wxCRT_StrcspnW, wxStrcspn_String)

 
 #undef WX_STR_DECL
 #undef WX_STR_CALL
 
 #undef WX_STR_DECL
 #undef WX_STR_CALL