static wxFile::Access() added

[wxWidgets.git] / src / common / dynarray.cpp

diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp
index fbf3972fe35cc27bf27dff963801ff6e33c63db7..40ada21b23988c2c63758363feb936696363c136 100644 (file)
--- a/src/common/dynarray.cpp
+++ b/src/common/dynarray.cpp
@@ -24,6 +24,7 @@
 #endif
 
 #include "wx/dynarray.h"
 #endif
 
 #include "wx/dynarray.h"

+#include <wx/intl.h>

 
 #include <stdlib.h>
 #include <string.h> // for memmove
 
 #include <stdlib.h>
 #include <string.h> // for memmove


@@ -100,7 +101,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;


@@ -226,7 +228,7 @@ void wxBaseArray::Add(long lItem, CMPFUNC fnCompare)
 // add item at the given position
 void wxBaseArray::Insert(long lItem, uint uiIndex)
 {
 // add item at the given position
 void wxBaseArray::Insert(long lItem, uint uiIndex)
 {

-  wxCHECK_RET( uiIndex <= m_uiCount, "bad index in wxArray::Insert" );
+  wxCHECK_RET( uiIndex <= m_uiCount, _("bad index in wxArray::Insert") );

 
   Grow();
 
 
   Grow();
 


@@ -239,7 +241,7 @@ void wxBaseArray::Insert(long lItem, uint uiIndex)
 // removes item from array (by index)
 void wxBaseArray::Remove(uint uiIndex)
 {
 // removes item from array (by index)
 void wxBaseArray::Remove(uint uiIndex)
 {

-  wxCHECK_RET( uiIndex <= m_uiCount, "bad index in wxArray::Remove" );
+  wxCHECK_RET( uiIndex <= m_uiCount, _("bad index in wxArray::Remove") );

 
   memmove(&m_pItems[uiIndex], &m_pItems[uiIndex + 1],
           (m_uiCount - uiIndex - 1)*sizeof(long));
 
   memmove(&m_pItems[uiIndex], &m_pItems[uiIndex + 1],
           (m_uiCount - uiIndex - 1)*sizeof(long));


@@ -252,7 +254,7 @@ void wxBaseArray::Remove(long lItem)
   int iIndex = Index(lItem);
 
   wxCHECK_RET( iIndex != NOT_FOUND,
   int iIndex = Index(lItem);
 
   wxCHECK_RET( iIndex != NOT_FOUND,

-               "removing inexistent item in wxArray::Remove" );
+               _("removing inexistent item in wxArray::Remove") );

 
   Remove((uint)iIndex);
 }
 
   Remove((uint)iIndex);
 }