X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c2e6a28129dcb918b9bb1531b13de7a7e89a33c..664ad22f4ca868dd87fe55f64627b61f1a7f89e7:/src/common/string.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 134cd452c6..d8a1d812b2 100644
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -46,13 +46,9 @@
   #include <clib.h>
 #endif
 
-#ifdef  WXSTRING_IS_WXOBJECT
-  IMPLEMENT_DYNAMIC_CLASS(wxString, wxObject)
-#endif  //WXSTRING_IS_WXOBJECT
-
 #if wxUSE_UNICODE
-#undef wxUSE_EXPERIMENTAL_PRINTF
-#define wxUSE_EXPERIMENTAL_PRINTF 1
+    #undef wxUSE_EXPERIMENTAL_PRINTF
+    #define wxUSE_EXPERIMENTAL_PRINTF 1
 #endif
 
 // allocating extra space for each string consumes more memory but speeds up
@@ -1101,6 +1097,7 @@ int wxString::Find(const wxChar *pszSub) const
 bool wxString::ToLong(long *val, int base) const
 {
     wxCHECK_MSG( val, FALSE, _T("NULL pointer in wxString::ToLong") );
+    wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
 
     const wxChar *start = c_str();
     wxChar *end;
@@ -1114,6 +1111,7 @@ bool wxString::ToLong(long *val, int base) const
 bool wxString::ToULong(unsigned long *val, int base) const
 {
     wxCHECK_MSG( val, FALSE, _T("NULL pointer in wxString::ToULong") );
+    wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
 
     const wxChar *start = c_str();
     wxChar *end;
@@ -2024,8 +2022,6 @@ wxArrayString::~wxArrayString()
 // pre-allocates memory (frees the previous data!)
 void wxArrayString::Alloc(size_t nSize)
 {
-  wxASSERT( nSize > 0 );
-
   // only if old buffer was not big enough
   if ( nSize > m_nSize ) {
     Free();