From ed582841a275d236b9bac7651a0f3e7c91be868d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 9 Jun 2001 16:35:38 +0000
Subject: [PATCH] 1. added wxAssertIsEqual() function to be used in wxASSERT()
 2. made wxTrap() public, documented it

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/intl.cpp   |  4 +---
 src/common/log.cpp    | 16 +++++++++++-----
 src/common/string.cpp | 16 +++++++++++-----
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 6c376a95a6..01d449fd53 100644
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -94,9 +94,7 @@ typedef unsigned char size_t8;
             {
                 // Asserting a sizeof directly causes some compilers to
                 // issue a "using constant in a conditional expression" warning
-                size_t intsize = sizeof(int);
-
-                wxASSERT_MSG( intsize == 4,
+                wxASSERT_MSG( wxAssertIsEqual(sizeof(int), 4),
                               "size_t32 is incorrectly defined!" );
             }
         } intsizechecker;
diff --git a/src/common/log.cpp b/src/common/log.cpp
index a73e2cdefa..4ee9687b9f 100644
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -705,8 +705,14 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
 
 #ifdef  __WXDEBUG__
 
+// wxASSERT() helper
+bool wxAssertIsEqual(int x, int y)
+{
+    return x == y;
+}
+
 // break into the debugger
-void Trap()
+void wxTrap()
 {
 #ifdef __WXMSW__
     DebugBreak();
@@ -732,7 +738,7 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
 
     if ( s_bInAssert ) {
         // He-e-e-e-elp!! we're trapped in endless loop
-        Trap();
+        wxTrap();
 
         s_bInAssert = FALSE;
 
@@ -777,7 +783,7 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
         switch ( ::MessageBox(NULL, szBuf, _T("Debug"),
                               MB_YESNOCANCEL | MB_ICONSTOP ) ) {
             case IDYES:
-                Trap();
+                wxTrap();
                 break;
 
             case IDCANCEL:
@@ -790,7 +796,7 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
         switch ( wxMessageBox(szBuf, wxT("Debug"),
                               wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
             case wxYES:
-                Trap();
+                wxTrap();
                 break;
 
             case wxCANCEL:
@@ -802,7 +808,7 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
 #endif // GUI or MSW
 
 #else // !GUI
-        Trap();
+        wxTrap();
 #endif // GUI/!GUI
     }
 
diff --git a/src/common/string.cpp b/src/common/string.cpp
index a53c4378f9..c8a3bf6694 100644
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -86,10 +86,10 @@ static const struct
 } g_strEmpty = { {-1, 0, 0}, wxT('\0') };
 
 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
-// must define this static for VA or else you get multiply defined symbols everywhere
+// must define this static for VA or else you get multiply defined symbols
+// everywhere
 const unsigned int wxSTRING_MAXLEN = UINT_MAX - 100;
-
-#endif
+#endif // Visual Age
 
 // empty C style string: points to 'string data' byte of g_strEmpty
 extern const wxChar WXDLLEXPORT *wxEmptyString = &g_strEmpty.dummy;
@@ -1870,8 +1870,14 @@ void wxArrayString::Copy(const wxArrayString& src)
 void wxArrayString::Grow()
 {
   // only do it if no more place
-  if( m_nCount == m_nSize ) {
-    if( m_nSize == 0 ) {
+  if ( m_nCount == m_nSize ) {
+    // if ARRAY_DEFAULT_INITIAL_SIZE were set to 0, the initially empty would
+    // be never resized!
+    #if ARRAY_DEFAULT_INITIAL_SIZE == 0
+      #error "ARRAY_DEFAULT_INITIAL_SIZE must be > 0!"
+    #endif
+
+    if ( m_nSize == 0 ) {
       // was empty, alloc some memory
       m_nSize = ARRAY_DEFAULT_INITIAL_SIZE;
       m_pItems = new wxChar *[m_nSize];
-- 
2.47.2