From 333e110dab18d80a24f143e3d26103bec255c34f Mon Sep 17 00:00:00 2001
From: Chris Elliott <biol75@york.ac.uk>
Date: Wed, 4 Sep 2002 12:24:45 +0000
Subject: [PATCH] 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
---
include/wx/debug.h | 8 ++------
src/common/appcmn.cpp | 11 +++++++++++
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/include/wx/debug.h b/include/wx/debug.h
index ee32d3a0eb..9c92739aaa 100644
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -90,15 +90,11 @@
// note using "int" and not "bool" for cond to avoid VC++ warnings about
// implicit conversions when doing "wxAssert( pointer )" and also use of
// "!!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,
int nLine,
const wxChar *szCond,
- const wxChar *szMsg = NULL)
- {
- if ( !cond )
- wxOnAssert(szFile, nLine, szCond, szMsg);
- }
+ const wxChar *szMsg = NULL) ;
// generic assert macro
#define wxASSERT(cond) wxAssert(!!(cond), __TFILE__, __LINE__, _T(#cond))
diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 6177cbcc67..cfd1d3df14 100644
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -494,6 +494,17 @@ void wxTrap()
#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
static
void ShowAssertDialog(const wxChar *szFile,
--
2.47.2