Applied patch [ 758687 ] RegisterHotkey implemented

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

diff --git a/include/wx/debug.h b/include/wx/debug.h
index 10e902d5c6266ba0573a04369f56fe61cce04ed8..ccad73ccbadf8119851a0e8b50c65e1add9b7da9 100644 (file)
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -181,19 +181,10 @@ WXDLLIMPEXP_DATA_BASE(extern const bool) wxFalse;
   particular, this is why we define a struct and not an object (which would
   result in a warning about unused variable) and a named struct (otherwise we'd
   get a warning about an unnamed struct not used to define an object!).
   particular, this is why we define a struct and not an object (which would
   result in a warning about unused variable) and a named struct (otherwise we'd
   get a warning about an unnamed struct not used to define an object!).

-  The _n__ part is to stop VC++ 7 being confused since it encloses __LINE++ in
-  parentheses. Unfortunately this does not work with other compilers, so
-  we will only enable it when we know the _precise_ symbols to test for.

  */
 
  */
 

-#define wxMAKE_ASSERT_NAME_HELPER(line)     wxAssert_ ## line
-#define wxMAKE_ASSERT_NAME(line)            wxMAKE_ASSERT_NAME_HELPER(line)
-#if 0
-#define wxMAKE_UNIQUE_ASSERT_NAME           wxMAKE_ASSERT_NAME(_n___ ## __LINE__)
-#else
-#define wxMAKE_UNIQUE_ASSERT_NAME           wxMAKE_ASSERT_NAME(__LINE__)
-#endif
-#define wxMAKE_UNIQUE_ASSERT_NAME2(text)    wxMAKE_ASSERT_NAME(text)
+#define wxMAKE_UNIQUE_ASSERT_NAME           wxMAKE_UNIQUE_NAME(wxAssert_)
+#define wxMAKE_UNIQUE_ASSERT_NAME2(text)    wxMAKE_UNIQUE_NAME(text)

 
 /*
   The second argument of this macro must be a valid C++ identifier and not a
 
 /*
   The second argument of this macro must be a valid C++ identifier and not a