couple of minor bug fixes/enhancements (interface unchanged)

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

diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp
index fbf3972fe35cc27bf27dff963801ff6e33c63db7..db5396e0ad28bd5a8096c719572f7952810bd768 100644 (file)
--- a/src/common/dynarray.cpp
+++ b/src/common/dynarray.cpp
@@ -100,7 +100,8 @@ void wxBaseArray::Grow()
     else
     {
       // add 50% but not too much
     else
     {
       // 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 )
         uiIncrement = ARRAY_MAXSIZE_INCREMENT;
       m_uiSize += uiIncrement;
       if ( uiIncrement > ARRAY_MAXSIZE_INCREMENT )
         uiIncrement = ARRAY_MAXSIZE_INCREMENT;
       m_uiSize += uiIncrement;

diff --git a/src/common/log.cpp b/src/common/log.cpp
index aba5c2c1f287c3b16baad17b8f83aa570dd9dac9..4eb067ff362370feea83904fcb761da43e6745f0 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -153,7 +153,7 @@ void wxLogVerbose(const char *szFormat, ...)
     // we check that all of mask bits are set in the current mask, so
     // that wxLogTrace(wxTraceRefCount | wxTraceOle) will only do something
     // if both bits are set.
     // we check that all of mask bits are set in the current mask, so
     // that wxLogTrace(wxTraceRefCount | wxTraceOle) will only do something
     // if both bits are set.

-    if ( pLog != NULL && (pLog->GetTraceMask() & mask == mask) ) {
+    if ( pLog != NULL && ((pLog->GetTraceMask() & mask) == mask) ) {

       va_list argptr;
       va_start(argptr, szFormat);
       vsprintf(s_szBuf, szFormat, argptr);
       va_list argptr;
       va_start(argptr, szFormat);
       vsprintf(s_szBuf, szFormat, argptr);

diff --git a/src/common/string.cpp b/src/common/string.cpp
index ac64abaeb62e35edb86ffb51ef1c7948b894c160..7e6e2270d770356a230236d4399db6a24dc36b29 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1089,9 +1089,9 @@ wxArrayString::wxArrayString(const wxArrayString& src)
 // assignment operator
 wxArrayString& wxArrayString::operator=(const wxArrayString& src)
 {
 // assignment operator
 wxArrayString& wxArrayString::operator=(const wxArrayString& src)
 {

-  Clear();
+  if ( m_nSize > 0 )
+    Clear();

 
 

-  m_nSize = 0;

   if ( src.m_nCount > ARRAY_DEFAULT_INITIAL_SIZE )
     Alloc(src.m_nCount);
 
   if ( src.m_nCount > ARRAY_DEFAULT_INITIAL_SIZE )
     Alloc(src.m_nCount);