Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced wcslen with wxWcslen

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-09-11 11:28:51 +00:00
parent a1db4ad4a4
commit ce68ad2572
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/docview.cpp
View File

@@ -1368,7 +1368,7 @@ static wxWindow* wxFindSuitableParent()
// template extension. // template extension.
wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
#if defined(__WXMSW__) || defined(__WXGTK__) #if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__)
int noTemplates, int noTemplates,
#else #else
int WXUNUSED(noTemplates), int WXUNUSED(noTemplates),
@@ -1378,7 +1378,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
bool WXUNUSED(save)) bool WXUNUSED(save))
{ {
// We can only have multiple filters in Windows and GTK // We can only have multiple filters in Windows and GTK
#if defined(__WXMSW__) || defined(__WXGTK__) #if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__)
wxString descrBuf; wxString descrBuf;
int i; int i;

6
src/common/strconv.cpp
View File

@@ -846,7 +846,8 @@ public:
|| ( defined(__MWERKS__) && defined(__WXMSW__) ) || ( defined(__MWERKS__) && defined(__WXMSW__) )
size_t inbuf = std::wcslen(psz); size_t inbuf = std::wcslen(psz);
#else #else
size_t inbuf = ::wcslen(psz); // size_t inbuf = ::wcslen(psz);
size_t inbuf = wxWcslen(psz);
#endif #endif
if (buf) if (buf)
w2m.Convert(psz,buf); w2m.Convert(psz,buf);
@@ -1038,7 +1039,8 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
|| ( defined(__MWERKS__) && defined(__WXMSW__) ) || ( defined(__MWERKS__) && defined(__WXMSW__) )
size_t len=std::wcslen(psz); size_t len=std::wcslen(psz);
#else #else
size_t len=::wcslen(psz); // size_t len=::wcslen(psz);
size_t len = wxWcslen(psz);
#endif #endif
if (buf) if (buf)
{ {