adding OnLaunched

[wxWidgets.git] / include / wx / debug.h

diff --git a/include/wx/debug.h b/include/wx/debug.h
index b6a61e293eabcbf36d968078993d87e723df9fe1..35c7ca1222608c382ccdde4dba97ac6ff5b0ac83 100644 (file)
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -257,7 +257,7 @@ extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,
     // If possible, we prefer to define it as a macro rather than as a function
     // to open the debugger at the position where we trapped and not inside the
     // trap function itself which is not very useful.
-    #ifdef __VISUALC__
+    #if wxCHECK_VISUALC_VERSION(7)
         #define wxTrap() __debugbreak()
     #else
         extern WXDLLIMPEXP_BASE void wxTrap();
@@ -297,7 +297,7 @@ extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,
         wxSTATEMENT_MACRO_BEGIN                                               \
             if ( wxTheAssertHandler &&                                        \
                     (wxOnAssert(__FILE__, __LINE__, __WXFUNCTION__,           \
-                                #cond, msg), wxTrapInAssert) )                \
+                                cond, msg), wxTrapInAssert) )                \
             {                                                                 \
                 wxTrapInAssert = false;                                       \
                 wxTrap();                                                     \