Need LINKAGEMODE for Visualage C++ compiles on the static global procs at the top

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index a4647eee3c027f20017ac1f47597a6d1f52a2ada..6d99576b99d69f9ca5e3a448fe7fd15c5c462516 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -535,7 +535,7 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
     wxConvCurrent->MB2WC(s_szBuf, strerror(nErrCode), WXSIZEOF(s_szBuf) -1);
     return s_szBuf;
 #else
     wxConvCurrent->MB2WC(s_szBuf, strerror(nErrCode), WXSIZEOF(s_szBuf) -1);
     return s_szBuf;
 #else

-    return strerror(nErrCode);
+    return strerror((int)nErrCode);

 #endif
 #endif  // Win/Unix
 }
 #endif
 #endif  // Win/Unix
 }


@@ -607,15 +607,16 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
         // send it to the normal log destination
         wxLogDebug(szBuf);
 
         // send it to the normal log destination
         wxLogDebug(szBuf);
 

-#if wxUSE_GUI
+#if wxUSE_GUI || defined(__WXMSW__)

         // this message is intentionally not translated - it is for
         // developpers only
         wxStrcat(szBuf, wxT("\nDo you want to stop the program?"
         // this message is intentionally not translated - it is for
         // developpers only
         wxStrcat(szBuf, wxT("\nDo you want to stop the program?"

-                "\nYou can also choose [Cancel] to suppress "
-                "further warnings."));
+                            "\nYou can also choose [Cancel] to suppress "
+                            "further warnings."));

 
 

-        switch ( wxMessageBox(szBuf, _("Debug"),
-                    wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
+#if wxUSE_GUI
+        switch ( wxMessageBox(szBuf, "Debug",
+                              wxYES_NO | wxCANCEL | wxICON_STOP ) ) {

             case wxYES:
                 Trap();
                 break;
             case wxYES:
                 Trap();
                 break;


@@ -624,8 +625,23 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
                 s_bNoAsserts = TRUE;
                 break;
 
                 s_bNoAsserts = TRUE;
                 break;
 

-                //case wxNO: nothing to do
+            //case wxNO: nothing to do
+        }
+#else // !GUI, but MSW
+        switch ( ::MessageBox(NULL, szBuf, "Debug",
+                              MB_YESNOCANCEL | MB_ICONSTOP ) ) {
+            case IDYES:
+                Trap();
+                break;
+
+            case IDCANCEL:
+                s_bNoAsserts = TRUE;
+                break;
+
+            //case IDNO: nothing to do

         }
         }

+#endif // GUI or MSW
+

 #else // !GUI
         Trap();
 #endif // GUI/!GUI
 #else // !GUI
         Trap();
 #endif // GUI/!GUI