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

couple of minor bug fixes/enhancements (interface unchanged)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-08-07 22:03:16 +00:00
parent 7c78e7c702
commit d93f63db9d
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/dynarray.cpp
View File

@@ -100,7 +100,8 @@ void wxBaseArray::Grow()
else else
{ {
// add 50% but not too much // add 50% but not too much
uint uiIncrement = m_uiSize >> 1; uint uiIncrement = m_uiSize < WX_ARRAY_DEFAULT_INITIAL_SIZE
? WX_ARRAY_DEFAULT_INITIAL_SIZE : m_uiSize >> 1;
if ( uiIncrement > ARRAY_MAXSIZE_INCREMENT ) if ( uiIncrement > ARRAY_MAXSIZE_INCREMENT )
uiIncrement = ARRAY_MAXSIZE_INCREMENT; uiIncrement = ARRAY_MAXSIZE_INCREMENT;
m_uiSize += uiIncrement; m_uiSize += uiIncrement;

2
src/common/log.cpp
View File

@@ -153,7 +153,7 @@ void wxLogVerbose(const char *szFormat, ...)
// we check that all of mask bits are set in the current mask, so // we check that all of mask bits are set in the current mask, so
// that wxLogTrace(wxTraceRefCount | wxTraceOle) will only do something // that wxLogTrace(wxTraceRefCount | wxTraceOle) will only do something
// if both bits are set. // if both bits are set.
if ( pLog != NULL && (pLog->GetTraceMask() & mask == mask) ) { if ( pLog != NULL && ((pLog->GetTraceMask() & mask) == mask) ) {
va_list argptr; va_list argptr;
va_start(argptr, szFormat); va_start(argptr, szFormat);
vsprintf(s_szBuf, szFormat, argptr); vsprintf(s_szBuf, szFormat, argptr);

4
src/common/string.cpp
View File

@@ -1089,9 +1089,9 @@ wxArrayString::wxArrayString(const wxArrayString& src)
// assignment operator // assignment operator
wxArrayString& wxArrayString::operator=(const wxArrayString& src) wxArrayString& wxArrayString::operator=(const wxArrayString& src)
{ {
Clear(); if ( m_nSize > 0 )
Clear();
m_nSize = 0;
if ( src.m_nCount > ARRAY_DEFAULT_INITIAL_SIZE ) if ( src.m_nCount > ARRAY_DEFAULT_INITIAL_SIZE )
Alloc(src.m_nCount); Alloc(src.m_nCount);