From e5bf74f1f0bbdb84076d9d45d5643de8260f96d7 Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Mon, 28 Jan 2002 23:26:31 +0000 Subject: [PATCH] OS/2 code only - make it easier to turn off popup asserts if necessary by restructuring code git-svn-id: svn://10.0.0.236/trunk@113060 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/base/nsDebug.cpp | 7 ++++--- mozilla/xpcom/glue/nsDebug.cpp | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mozilla/xpcom/base/nsDebug.cpp b/mozilla/xpcom/base/nsDebug.cpp index c022df2cc61..886da2035ac 100644 --- a/mozilla/xpcom/base/nsDebug.cpp +++ b/mozilla/xpcom/base/nsDebug.cpp @@ -268,9 +268,10 @@ NS_COM void nsDebug::Assertion(const char* aStr, const char* aExpr, PR_snprintf(msg, sizeof(msg), "%s\n\nClick Cancel to Debug Application.\n" "Click Enter to continue running the Application.", buf); - ULONG code = WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, msg, - "nsDebug::Assertion", 0, - MB_ERROR | MB_ENTERCANCEL); + ULONG code = MBID_ERROR; + code = WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, msg, + "nsDebug::Assertion", 0, + MB_ERROR | MB_ENTERCANCEL); /* It is possible that we are executing on a thread that doesn't have a * message queue. In that case, the message won't appear, and code will diff --git a/mozilla/xpcom/glue/nsDebug.cpp b/mozilla/xpcom/glue/nsDebug.cpp index c022df2cc61..886da2035ac 100644 --- a/mozilla/xpcom/glue/nsDebug.cpp +++ b/mozilla/xpcom/glue/nsDebug.cpp @@ -268,9 +268,10 @@ NS_COM void nsDebug::Assertion(const char* aStr, const char* aExpr, PR_snprintf(msg, sizeof(msg), "%s\n\nClick Cancel to Debug Application.\n" "Click Enter to continue running the Application.", buf); - ULONG code = WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, msg, - "nsDebug::Assertion", 0, - MB_ERROR | MB_ENTERCANCEL); + ULONG code = MBID_ERROR; + code = WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, msg, + "nsDebug::Assertion", 0, + MB_ERROR | MB_ENTERCANCEL); /* It is possible that we are executing on a thread that doesn't have a * message queue. In that case, the message won't appear, and code will