1. wxMSW seems to work (please test and send your bug reports!)

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

diff --git a/include/wx/debug.h b/include/wx/debug.h
index ca8a8989b9d3801e9a527f17332632fced4c0c43..99d01d268adedc5af25041f9594ddf577a309b94 100644 (file)
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -14,6 +14,13 @@
 
 #include  <assert.h>
 
 
 #include  <assert.h>
 

+#include  "wx/wxchar.h"
+
+#ifndef __TFILE__
+#define __XFILE__(x) _T(x)
+#define __TFILE__ __XFILE__(__FILE__)
+#endif
+

 // ----------------------------------------------------------------------------
 /** 
   @name Debugging macros 
 // ----------------------------------------------------------------------------
 /** 
   @name Debugging macros 


@@ -51,18 +58,18 @@
   @param   szFile and nLine - file name and line number of the ASSERT
            szMsg            - optional message explaining the reason
   */
   @param   szFile and nLine - file name and line number of the ASSERT
            szMsg            - optional message explaining the reason
   */

-  void WXDLLEXPORT wxOnAssert(const char *szFile, int nLine, const char *szMsg = (const char *) NULL);
+  void WXDLLEXPORT wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg = (const wxChar *) NULL);

 
   /// generic assert macro
 
   /// generic assert macro

-  #define   wxASSERT(cond)   if ( !(cond) ) wxOnAssert(__FILE__, __LINE__)
+  #define   wxASSERT(cond)   if ( !(cond) ) wxOnAssert(__TFILE__, __LINE__)

 
 #if 0 // defined(__BORLANDC__) && defined(__WIN16__)
   // Too much text, so make wxASSERT_MSG the same as wxASSERT,
   // thus removing the text from the program.
 
 #if 0 // defined(__BORLANDC__) && defined(__WIN16__)
   // Too much text, so make wxASSERT_MSG the same as wxASSERT,
   // thus removing the text from the program.

-  #define   wxASSERT_MSG(x, m)  if ( !(x) ) wxOnAssert(__FILE__, __LINE__)
+  #define   wxASSERT_MSG(x, m)  if ( !(x) ) wxOnAssert(__TFILE__, __LINE__)

 #else
   /// assert with additional message explaining it's cause
 #else
   /// assert with additional message explaining it's cause

-  #define   wxASSERT_MSG(x, m)  if ( !(x) ) wxOnAssert(__FILE__, __LINE__, m)
+  #define   wxASSERT_MSG(x, m)  if ( !(x) ) wxOnAssert(__TFILE__, __LINE__, m)

 #endif
 
 #else
 #endif
 
 #else


@@ -115,4 +122,3 @@
 //@}
 
 #endif  // _WX_DEBUG_H_
 //@}
 
 #endif  // _WX_DEBUG_H_

-