move code from .h to .cpp to prevent Borland warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -90,15 +90,11 @@
|
|||||||
// note using "int" and not "bool" for cond to avoid VC++ warnings about
|
// note using "int" and not "bool" for cond to avoid VC++ warnings about
|
||||||
// implicit conversions when doing "wxAssert( pointer )" and also use of
|
// implicit conversions when doing "wxAssert( pointer )" and also use of
|
||||||
// "!!cond" below to ensure that everything is converted to int
|
// "!!cond" below to ensure that everything is converted to int
|
||||||
inline void WXDLLEXPORT wxAssert(int cond,
|
extern void WXDLLEXPORT wxAssert(int cond,
|
||||||
const wxChar *szFile,
|
const wxChar *szFile,
|
||||||
int nLine,
|
int nLine,
|
||||||
const wxChar *szCond,
|
const wxChar *szCond,
|
||||||
const wxChar *szMsg = NULL)
|
const wxChar *szMsg = NULL) ;
|
||||||
{
|
|
||||||
if ( !cond )
|
|
||||||
wxOnAssert(szFile, nLine, szCond, szMsg);
|
|
||||||
}
|
|
||||||
|
|
||||||
// generic assert macro
|
// generic assert macro
|
||||||
#define wxASSERT(cond) wxAssert(!!(cond), __TFILE__, __LINE__, _T(#cond))
|
#define wxASSERT(cond) wxAssert(!!(cond), __TFILE__, __LINE__, _T(#cond))
|
||||||
|
@@ -494,6 +494,17 @@ void wxTrap()
|
|||||||
#endif // Win/Unix
|
#endif // Win/Unix
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void wxAssert(int cond,
|
||||||
|
const wxChar *szFile,
|
||||||
|
int nLine,
|
||||||
|
const wxChar *szCond,
|
||||||
|
const wxChar *szMsg)
|
||||||
|
{
|
||||||
|
if ( !cond )
|
||||||
|
wxOnAssert(szFile, nLine, szCond, szMsg);
|
||||||
|
}
|
||||||
|
|
||||||
// show the assert modal dialog
|
// show the assert modal dialog
|
||||||
static
|
static
|
||||||
void ShowAssertDialog(const wxChar *szFile,
|
void ShowAssertDialog(const wxChar *szFile,
|
||||||
|
Reference in New Issue
Block a user