Added m_destroybuf initialisation

[wxWidgets.git] / src / common / log.cpp

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 837956d26ad3039c05c740b8efe98a706078a80c..18428e6d0c72b492488370e2aba1d93070b0ab0b 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -50,6 +50,8 @@
 #include  "wx/log.h"
 #include  "wx/thread.h"
 
+#if wxUSE_LOG
+
 // other standard headers
 #include  <errno.h>
 #include  <stdlib.h>
@@ -750,31 +752,33 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
         // developpers only
         wxStrcat(szBuf, wxT("\nDo you want to stop the program?\nYou can also choose [Cancel] to suppress further warnings."));
 
-#if wxUSE_GUI
-        switch ( wxMessageBox(szBuf, wxT("Debug"),
-                              wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
-            case wxYES:
+        // use the native message box if available: this is more robust than
+        // using our own
+#ifdef __WXMSW__
+        switch ( ::MessageBox(NULL, szBuf, _T("Debug"),
+                              MB_YESNOCANCEL | MB_ICONSTOP ) ) {
+            case IDYES:
                 Trap();
                 break;
 
-            case wxCANCEL:
+            case IDCANCEL:
                 s_bNoAsserts = TRUE;
                 break;
 
-            //case wxNO: nothing to do
+            //case IDNO: nothing to do
         }
-#else // !GUI, but MSW
-        switch ( ::MessageBox(NULL, szBuf, _T("Debug"),
-                              MB_YESNOCANCEL | MB_ICONSTOP ) ) {
-            case IDYES:
+#else // !MSW
+        switch ( wxMessageBox(szBuf, wxT("Debug"),
+                              wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
+            case wxYES:
                 Trap();
                 break;
 
-            case IDCANCEL:
+            case wxCANCEL:
                 s_bNoAsserts = TRUE;
                 break;
 
-            //case IDNO: nothing to do
+            //case wxNO: nothing to do
         }
 #endif // GUI or MSW
 
@@ -788,3 +792,4 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
 
 #endif  //WXDEBUG
 
+#endif //wxUSE_LOG