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

wxString::Scanf() removed because can't be implemented portably

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-06-22 22:04:23 +00:00
parent e9c7dfb9b5
commit 9efd3367c0
1 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/common/string.cpp
View File

@@ -837,7 +837,7 @@ int wxString::Find(const char *pszSub) const
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// formatted input/output // formatted output
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
int wxString::Printf(const char *pszFormat, ...) int wxString::Printf(const char *pszFormat, ...)
{ {
@@ -853,7 +853,7 @@ int wxString::Printf(const char *pszFormat, ...)
int wxString::PrintfV(const char* pszFormat, va_list argptr) int wxString::PrintfV(const char* pszFormat, va_list argptr)
{ {
static char s_szScratch[1024]; // @@@@ shouldn't use fixed-size buffer! static char s_szScratch[1024];
int iLen = vsprintf(s_szScratch, pszFormat, argptr); int iLen = vsprintf(s_szScratch, pszFormat, argptr);
AllocBeforeWrite(iLen); AllocBeforeWrite(iLen);
@@ -862,23 +862,6 @@ int wxString::PrintfV(const char* pszFormat, va_list argptr)
return iLen; return iLen;
} }
int wxString::Scanf(const char *pszFormat, ...) const
{
va_list argptr;
va_start(argptr, pszFormat);
int iLen = ScanfV(pszFormat, argptr);
va_end(argptr);
return iLen;
}
int wxString::ScanfV(const char *pszFormat, va_list argptr) const
{
return vsscanf(c_str(), pszFormat, argptr);
}
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// standard C++ library string functions // standard C++ library string functions
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -1149,7 +1132,7 @@ void wxArrayString::Alloc(size_t nSize)
// searches the array for an item (forward or backwards) // searches the array for an item (forward or backwards)
// Robert Roebling (changed to bool from Bool) // Robert Roebling (changed to bool from bool)
int wxArrayString::Index(const char *sz, bool bCase, bool bFromEnd) const int wxArrayString::Index(const char *sz, bool bCase, bool bFromEnd) const
{ {
@@ -1186,7 +1169,7 @@ void wxArrayString::Add(const wxString& src)
// add item at the given position // add item at the given position
void wxArrayString::Insert(const wxString& src, size_t nIndex) void wxArrayString::Insert(const wxString& src, size_t nIndex)
{ {
wxCHECK( nIndex <= m_nCount ); wxCHECK_RET( nIndex <= m_nCount, "bad index in wxArrayString::Insert" );
Grow(); Grow();
@@ -1202,7 +1185,7 @@ void wxArrayString::Insert(const wxString& src, size_t nIndex)
// removes item from array (by index) // removes item from array (by index)
void wxArrayString::Remove(size_t nIndex) void wxArrayString::Remove(size_t nIndex)
{ {
wxCHECK( nIndex <= m_nCount ); wxCHECK_RET( nIndex <= m_nCount, "bad index in wxArrayString::Remove" );
// release our lock // release our lock
Item(nIndex).GetStringData()->Unlock(); Item(nIndex).GetStringData()->Unlock();
@@ -1217,15 +1200,14 @@ void wxArrayString::Remove(const char *sz)
{ {
int iIndex = Index(sz); int iIndex = Index(sz);
wxCHECK( iIndex != NOT_FOUND ); wxCHECK_RET( iIndex != NOT_FOUND,
"removing inexistent element in wxArrayString::Remove" );
Remove((size_t)iIndex); Remove((size_t)iIndex);
} }
// sort array elements using passed comparaison function // sort array elements using passed comparaison function
// Robert Roebling (changed to bool from Bool)
void wxArrayString::Sort(bool bCase, bool bReverse) void wxArrayString::Sort(bool bCase, bool bReverse)
{ {
//@@@@ TO DO //@@@@ TO DO