moving tlw list up, cleanup

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

diff --git a/include/wx/debug.h b/include/wx/debug.h
index 69d0b1eb81bd550f93c22187e58a5029696815c2..4d678a777004f047299293c377c1c79d3245b19f 100644 (file)
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -14,9 +14,11 @@
 #ifndef   _WX_DEBUG_H_
 #define   _WX_DEBUG_H_
 
 #ifndef   _WX_DEBUG_H_
 #define   _WX_DEBUG_H_
 

+#ifndef __WXPALMOS5__

 #ifndef __WXWINCE__
 #include  <assert.h>
 #endif
 #ifndef __WXWINCE__
 #include  <assert.h>
 #endif

+#endif // ! __WXPALMOS5__

 #include  <limits.h>            /*  for CHAR_BIT used below */
 
 #include  "wx/chartype.h"     /*  for __TFILE__ and wxChar */
 #include  <limits.h>            /*  for CHAR_BIT used below */
 
 #include  "wx/chartype.h"     /*  for __TFILE__ and wxChar */


@@ -92,7 +94,7 @@
   /*
     This function is called whenever one of debugging macros fails (i.e.
     condition is false in an assertion). To customize its behaviour, override
   /*
     This function is called whenever one of debugging macros fails (i.e.
     condition is false in an assertion). To customize its behaviour, override

-    wxApp::OnAssert().
+    wxApp::OnAssertFailure().

 
     Parameters:
        szFile and nLine - file name and line number of the ASSERT
 
     Parameters:
        szFile and nLine - file name and line number of the ASSERT


@@ -101,7 +103,7 @@
        szMsg            - optional message explaining the reason
   */
 
        szMsg            - optional message explaining the reason
   */
 

-  /* this version is for compatibility with wx 2.8: */
+  /* this version is for compatibility with wx 2.8 Unicode build only: */

   extern void WXDLLIMPEXP_BASE wxOnAssert(const wxChar *szFile,
                                           int nLine,
                                           const char *szFunc,
   extern void WXDLLIMPEXP_BASE wxOnAssert(const wxChar *szFile,
                                           int nLine,
                                           const char *szFunc,


@@ -129,10 +131,14 @@
                                           const char *szFunc,
                                           const char *szCond,
                                           const wxChar *szMsg);
                                           const char *szFunc,
                                           const char *szCond,
                                           const wxChar *szMsg);

-#endif // wxUSE_UNICODE
+#endif /* wxUSE_UNICODE */

 
 

-  class WXDLLIMPEXP_BASE wxString;
-  /* these two work when szMsg passed to debug macro is a string: */
+  class WXDLLIMPEXP_FWD_BASE wxString;
+  class WXDLLIMPEXP_FWD_BASE wxCStrData;
+
+  /* these two work when szMsg passed to debug macro is a string,
+     we also have to provide wxCStrData overload to resolve ambiguity
+     which would otherwise arise from wxASSERT( s.c_str() ): */

   extern void WXDLLIMPEXP_BASE wxOnAssert(const wxString& szFile,
                                           int nLine,
                                           const wxString& szFunc,
   extern void WXDLLIMPEXP_BASE wxOnAssert(const wxString& szFile,
                                           int nLine,
                                           const wxString& szFunc,


@@ -144,6 +150,12 @@
                                           const wxString& szFunc,
                                           const wxString& szCond);
 
                                           const wxString& szFunc,
                                           const wxString& szCond);
 

+  extern void WXDLLIMPEXP_BASE wxOnAssert(const char *szFile,
+                                          int nLine,
+                                          const char *szFunc,
+                                          const char *szCond,
+                                          const wxCStrData& msg);
+

   extern void WXDLLIMPEXP_BASE wxOnAssert(const char *szFile,
                                           int nLine,
                                           const char *szFunc,
   extern void WXDLLIMPEXP_BASE wxOnAssert(const char *szFile,
                                           int nLine,
                                           const char *szFunc,