X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55fd62c1e370bef69657f220ddd591743e842be8..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/debug.h

diff --git a/include/wx/debug.h b/include/wx/debug.h
index b6a61e293e..f80f7be680 100644
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -3,7 +3,6 @@
 // Purpose:     Misc debug functions and macros
 // Author:      Vadim Zeitlin
 // Created:     29/01/98
-// RCS-ID:      $Id$
 // Copyright:   (c) 1998-2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -257,7 +256,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 +296,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();                                                     \