AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1. added wxAssertIsEqual() function to be used in wxASSERT()

Browse Source 
2. made wxTrap() public, documented it


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-06-09 16:35:38 +00:00
parent 749b01f037
commit ed582841a2
3 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/intl.cpp
View File

@ -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;

16
src/common/log.cpp
View File

@ -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
}

16
src/common/string.cpp
View File

@ -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];