Ticket #4592: 0001-Close-alerts-with-ESCAPE-key.patch

src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.cpp

@@ -195 +195 @@
             str << " Please check your Shortcuts settings.";
         }
 
-        if (fArgc < 1 || err != B_NO_ERROR)
-            (new BAlert(str1.String(), str.String(), "OK"))->Go(NULL);
+        if (fArgc < 1 || err != B_NO_ERROR) {
+            BAlert* alert = new BAlert(str1.String(), str.String(), "OK");
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go(NULL);
+        }
     }
 }
 
@@ -1015 +1018 @@
             str << "Can't launch handler for ";
             str << ", no such MIME type exists. Please check your Shortcuts";
             str << " settings.";
-            (new BAlert(str1.String(), str.String(), "OK"))->Go(NULL);
+            BAlert* alert = new BAlert(str1.String(), str.String(), "OK");
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go(NULL);
         }
     }
 }
@@ -1693 +1698 @@
         BString str1("Shortcuts SendMessage error");
         if (fSignature.Length() == 0) {
             str << "SendMessage: Target application signature not specified";
-            (new BAlert(str1.String(), str.String(), "OK"))->Go(NULL);
+            BAlert* alert = new BAlert(str1.String(), str.String(), "OK");
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go(NULL);
         } else {
             status_t error = B_OK;
             BMessenger msngr(fSignature.String(), -1, &error);

src/add-ons/input_server/methods/canna/CannaLooper.cpp

@@ -178 +178 @@
                 "  Copyright 1992 NEC Corporation, Tokyo, Japan\n"
                 "  Special thanks to T.Murai for porting\n",
                 "OK");
+            panel->SetFlags(B_CLOSE_ON_ESCAPE);
             panel->Go();
             break;
         }

src/add-ons/input_server/methods/pen/PenInputServerMethod.cpp

@@ -53 +53 @@
     //fDebugFile.SetTo("/tmp/PenInputMethodMessages.txt", B_READ_WRITE|B_CREATE_FILE);
     fDebugAlert = new BAlert("PenInput Debug", "Plip                                   \n\n\n\n\n\n\n\n\n\n\n\n\n", "OK");
     fDebugAlert->SetLook(B_TITLED_WINDOW_LOOK);
+    fDebugAlert->SetFlags(B_CLOSE_ON_ESCAPE);
     fDebugAlert->TextView()->MakeSelectable();
     fDebugAlert->TextView()->SelectAll();
     fDebugAlert->TextView()->Delete();

src/add-ons/input_server/methods/t9/DictionaryInputServerMethod.cpp

@@ -178 +178 @@
       s << " - ";
       s << (long) fDeskbarMenu->ItemAt(v);
       BAlert *a = new BAlert("Plop", s.String(), "OK");
+      a->SetFlags(B_CLOSE_ON_ESCAPE);
       a->Go(NULL);
       }*/
     break;

src/add-ons/input_server/methods/t9/T9InputServerMethod.cpp

@@ -179 +179 @@
       s << " - ";
       s << (long) fDeskbarMenu->ItemAt(v);
       BAlert *a = new BAlert("Plop", s.String(), "OK");
+      a->SetFlags(B_CLOSE_ON_ESCAPE);
       a->Go(NULL);
       }*/
     break;

src/add-ons/mail_daemon/inbound_filters/notifier/filter.cpp

@@ -79 +79 @@
 
         BAlert *alert = new BAlert(B_TRANSLATE("New messages"), text.String(),
             B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->SetFeel(B_NORMAL_WINDOW_FEEL);
         alert->Go(NULL);
     }

src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilterConfig.cpp

@@ -421 +421 @@
     return; // Successful.
 
 ErrorExit:
-    (new BAlert ("SpamFilterConfig Error", B_TRANSLATE("Sorry, unable to "
-        "launch the spamdbm program to let you edit the server settings."),
-        B_TRANSLATE("Close")))->Go ();
+    BAlert* alert = new BAlert ("SpamFilterConfig Error", B_TRANSLATE("Sorry, "
+        "unable to launch the spamdbm program to let you edit the server "
+        "settings."), B_TRANSLATE("Close"));
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
+    alert->Go ();
     return;
 }
 

src/add-ons/print/drivers/canon_lips/lips3/Lips3.cpp

@@ -190 +190 @@
             } else if (compressedSize > out_size) {
                 BAlert* alert = new BAlert("memory overrun!!!", "warning",
                     "OK");
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
                 alert->Go();
                 return false;
             } else {
@@ -224 +225 @@
     }
     catch (TransportException& err) {
         BAlert* alert = new BAlert("", err.What(), "OK");
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         return false;
     } 

src/add-ons/print/drivers/canon_lips/lips4/Lips4.cpp

@@ -200 +200 @@
                 buffer = out_buffer;
             } else if (compressed_size > out_size) {
                 BAlert* alert = new BAlert("memory overrun!!!", "warning", "OK");
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
                 alert->Go();
                 return false;
             } else {
@@ -234 +235 @@
     }
     catch (TransportException& err) {
         BAlert* alert = new BAlert("", err.What(), "OK");
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         return false;
     } 

src/add-ons/print/drivers/gutenprint/GPDriver.cpp

@@ -308 +308 @@
     text << "\n";
     text << message;
     BAlert* alert = new BAlert("", text.String(), "OK");
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
 }

src/add-ons/print/drivers/pcl5/PCL5.cpp

@@ -213 +213 @@
     }
     catch (TransportException& err) {
         BAlert* alert = new BAlert("", err.What(), "OK");
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         return false;
     } 

src/add-ons/print/drivers/pcl6/PCL6.cpp

@@ -176 +176 @@
     }
     catch (TransportException& err) {
         BAlert* alert = new BAlert("", err.What(), "OK");
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         return false;
     } 

src/add-ons/print/drivers/pdf/source/MessagePrinter.cpp

@@ -53 +53 @@
     // open a file to print message on the desktop
     status = find_directory(B_DESKTOP_DIRECTORY, &settingsPath);
     if (status != B_OK) {
-        (new BAlert("","find directory error", "Doh!"))->Go();
+        BAlert* alert = new BAlert("","Find directory error", "Doh!");
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
         return status;
     }
 
     settingsPath.Append(msgFileName);
     status = file.SetTo(settingsPath.Path(), B_WRITE_ONLY | B_CREATE_FILE);
     if (status != B_OK) {
-        (new BAlert("","file write error", "Doh!"))->Go();
+        BAlert* alert = new BAlert("","File write error", "Doh!");
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
         return status;
     }   
     
@@ -73 +77 @@
         // count
         out << i;
         if (file.Write(out.String(), out.Length()) < 0) {
-            (new BAlert("","count write error", "Doh!"))->Go();
+            BAlert* alert = new BAlert("","Count write error", "Doh!");
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
             return B_ERROR;
         }   
         // name
         out = " ";
         out << name;
         if (file.Write(out.String(), out.Length()) < 0) {
-            (new BAlert("","name write error", "Doh!"))->Go();
+            BAlert* alert = new BAlert("","Name write error", "Doh!");
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
             return B_ERROR;
         }   
         
@@ -164 +172 @@
                 break;
         }
         if (file.Write(out.String(), out.Length()) < 0) {
-            (new BAlert("","value write error", "Doh!"))->Go();
+            BAlert* alert = new BAlert("","Value write error", "Doh!");
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
             return B_ERROR;
         }   
     }

src/add-ons/print/drivers/pdf/source/PrinterDriver.cpp

@@ -203 +203 @@
 
     sprintf(text, "Faking print of page %ld/%ld...", pageNumber, pageCount);
     BAlert *alert = new BAlert("PrinterDriver::PrintPage()", text, "Hmm?");
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
     return B_OK;
 }

src/add-ons/print/drivers/postscript/PS.cpp

@@ -336 +336 @@
     }
     catch (TransportException& err) {
         BAlert* alert = new BAlert("", err.What(), "OK");
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         return false;
     } 

src/add-ons/print/transports/hp_jetdirect/HPJetDirectTransport.cpp

@@ -55 +55 @@
     fEndpoint = new BNetEndpoint(SOCK_STREAM);
     if ((fReady = fEndpoint->InitCheck()) != B_OK) {
         BAlert *alert = new BAlert("", "Fail to create the NetEndpoint!", "OK");
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         return;
     }
@@ -66 +67 @@
     } else {
         BAlert *alert = new BAlert("",
             "Can't connect to HP JetDirect printer port!", "OK");
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         fReady = B_ERROR;
     }

src/add-ons/print/transports/hp_jetdirect/SetupWindow.cpp

@@ -135 +135 @@
 
             if (ep->Connect(fServerAddress->Text(), port) != B_OK) {
                 BString text;
-                text << "Fail to connect to " << fServerAddress->Text() << ":" << (int) port << "!";
+                text << "Failed to connect to " << fServerAddress->Text() << ":" << (int) port << "!";
                 BAlert* alert = new BAlert("", text.String(), "OK");
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
                 alert->Go();
                 return false;
             };
@@ -149 +150 @@
         };
     };
 
-    BAlert* alert = new BAlert("", "please input parameters.", "OK");
+    BAlert* alert = new BAlert("", "Please input parameters.", "OK");
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
     return false;
 }

src/add-ons/print/transports/ipp/IppSetupDlg.cpp

@@ -141 +141 @@
     }
 
     BAlert *alert = new BAlert("", error_msg.c_str(), "OK");
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
     return false;
 }

src/add-ons/print/transports/ipp/IppTransport.cpp

@@ -129 +129 @@
 
     if (__error) {
         BAlert *alert = new BAlert("", error_msg.c_str(), "OK");
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
     }
 }

src/add-ons/print/transports/lpr/LprSetupDlg.cpp

@@ -142 +142 @@
 
         catch (LPSException &err) {
             BAlert *alert = new BAlert("", err.what(), "OK");
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             alert->Go();
             return false;
         }
@@ -155 +156 @@
 
     BAlert *alert = new BAlert("", "Please enter server address and printer"
         "queue name.", "OK");
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
     return false;
 }

src/add-ons/print/transports/lpr/LprTransport.cpp

@@ -129 +129 @@
     catch (LPSException &err) {
         DBGMSG(("error: %s\n", err.what()));
         BAlert *alert = new BAlert("", err.what(), "OK");
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
     }
 }

src/add-ons/tracker/iconvader/IconVader.cpp

@@ -18 +18 @@
         view->UnlockLooper();
     BString s(strerror(status));
     alert = new BAlert("Error", s.String(), "OK");
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
 }
 
@@ -80 +81 @@
 
 
 
-    alert = new BAlert("Error", "IconVader:\nClick on the icons to get points.\nAvoid symlinks!", "OK");
+    alert = new BAlert("Error", "IconVader:\nClick on the icons to get points."
+        "\nAvoid symlinks!", "OK");
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
 
 
@@ -133 +136 @@
     BString scoreStr("You scored ");
     scoreStr << score << " points!";
     alert = new BAlert("Error", scoreStr.String(), "Cool!");
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
 
 

src/add-ons/tracker/opentargetfolder/opentargetfolder.cpp

@@ -38 +38 @@
         if (link.MakeLinkedPath(&directory, &path) < B_OK
             || targetEntry.SetTo(path.Path()) != B_OK
             || targetEntry.GetParent(&targetEntry) != B_OK) {
-            (new BAlert("Open Target Folder",
+            BAlert* alert = new BAlert("Open Target Folder",
                 "Cannot open target folder. Maybe this link is broken?",
-                "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go(NULL);
+                "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go(NULL);
             continue;
         }
 
@@ -59 +61 @@
     }
 
     if (errors) {
-        (new BAlert("Open Target Folder",
+        BAlert* alert = new BAlert("Open Target Folder",
             "This add-on can only be used on symbolic links.\n"
             "It opens the folder of the link target in Tracker.",
-            "OK"))->Go(NULL);
+            "OK");
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go(NULL);
     }
 }
 

src/add-ons/translators/ppm/PPMMain.cpp

@@ -51 +51 @@
         BAlert * err = new BAlert("Error", 
             B_TRANSLATE("Something is wrong with the PPMTranslator!"), 
             B_TRANSLATE("OK"));
+        err->SetFlags(B_CLOSE_ON_ESCAPE);
         err->Go();
         return 1;
     }

src/add-ons/translators/shared/TranslatorWindow.cpp

@@ -88 +88 @@
     if (translator->MakeConfigurationView(NULL, &view, &rect)) {
         BAlert *err = new BAlert(B_TRANSLATE("Error"),
             B_TRANSLATE("Unable to create the view."), B_TRANSLATE("OK"));
+        err->SetFlags(B_CLOSE_ON_ESCAPE);
         err->Go();
         return B_ERROR;
     }

src/apps/autoraise/AutoRaiseApp.cpp

@@ -70 +70 @@
         BAlert *alert = new BAlert("usage box", APP_NAME ", (c) 2002, mmu_man\nUsage: " APP_NAME " [options]\n\t--deskbar\twill not open window, will just put " APP_NAME " into tray\n\t--persist will put "APP_NAME" into tray such that it remains between bootings\n", "OK", NULL, NULL,
             B_WIDTH_AS_USUAL, B_OFFSET_SPACING, B_INFO_ALERT);
         alert->SetShortcut(0, B_ENTER);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         be_app_messenger.SendMessage(B_QUIT_REQUESTED);
     }

src/apps/autoraise/AutoRaiseIcon.cpp

@@ -542 +542 @@
             alert = new BAlert("about box", "AutoRaise, (c) 2002, mmu_man\nEnjoy :-)", "OK", NULL, NULL,
                 B_WIDTH_AS_USUAL, B_OFFSET_SPACING, B_INFO_ALERT);
             alert->SetShortcut(0, B_ENTER);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             alert->Go(NULL); // use asynchronous version
             break;
         case OPEN_SETTINGS:

src/apps/bootmanager/BootManagerController.cpp

@@ -177 +177 @@
     BAlert* alert = new BAlert("info",
         B_TRANSLATE("At least one partition must be selected!"),
         B_TRANSLATE_COMMENT("OK", "Button"));
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
 
     return false;

src/apps/bsnow/SnowView.cpp

@@ -214 +214 @@
             "Where is Santa ??");
         info->SetFeel(B_NORMAL_WINDOW_FEEL);
         info->SetLook(B_FLOATING_WINDOW_LOOK);
-        info->SetFlags(info->Flags()|B_NOT_ZOOMABLE);
+        info->SetFlags(info->Flags()|B_NOT_ZOOMABLE|B_CLOSE_ON_ESCAPE);
         info->Go(NULL);
         break;
     default:

src/apps/cdplayer/CDDBSupport.cpp

@@ -1121 +1121 @@
 
         // TODO: finish, once I find an entry which actually has a year in it
         BAlert *alert = new BAlert("SimplyVorbis", "DYEAR entry found\n", "OK");
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         
     }

src/apps/cdplayer/CDPlayer.cpp

@@ -88 +88 @@
             "It appears that there are no CD"
             " drives on your computer or there is no system software to "
             "support one. Sorry."), B_TRANSLATE("OK"));
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
     }
 

src/apps/clock/cl_view.cpp

@@ -361 +361 @@
                 "Clock (The Replicant version)\n\n(C)2002, 2003 OpenBeOS,\n"
                 "2004 - 2007, Haiku, Inc.\n\nOriginally coded  by the folks "
                 "at Be.\n  Copyright Be Inc., 1991 - 1998", "OK");
-            
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             alert->Go();
         }   break;
 

src/apps/codycam/CodyCam.cpp

@@ -62 +62 @@
         B_TRANSLATE("OK"));
     if (window != NULL)
         alert->CenterIn(window->Frame());
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
 
     printf("%s\n%s [%lx]", message, strerror(err), err);

src/apps/cortex/AddOnHost/AddOnHostApp.cpp

@@ -170 +170 @@
 {
     App app;
     if (argc < 2 || strcmp(argv[1], "--addon-host") != 0) {
-        int32 response = (new BAlert(
-            "Cortex AddOnHost",
+        BAlert* alert = new BAlert("Cortex AddOnHost",
             "This program runs in the background, and is started automatically "
             "by Cortex when necessary.  You probably don't want to start it manually.",
-            "Continue", "Quit"))->Go();
+            "Continue", "Quit");
+        alert->SetShortcut(1, B_ESCAPE);
+        int32 response = alert->Go();
+
         if(response == 1)
             return 0;
     }

src/apps/cortex/MediaRoutingView/MediaRoutingView.cpp

@@ -988 +988 @@
      || (messenger.SendMessage(&message) != B_OK)) {
         BAlert *alert = new BAlert("Error", text.String(), "OK", 0, 0,
                                    B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
     }
 }

src/apps/cortex/ParameterView/ParameterWindow.cpp

@@ -162 +162 @@
                 s << " (" << strerror(error) << ")";
                 BAlert *alert = new BAlert("", s.String(), "OK", 0, 0,
                                            B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
                 alert->Go(0);
             }
             bool replace = false;

src/apps/cortex/RouteApp/RouteWindow.cpp

@@ -372 +372 @@
 //
     switch (pMsg->what) {
         case B_ABOUT_REQUESTED:
-            (new BAlert("About", g_aboutText, "OK"))->Go();
+        {
+            BAlert* alert = new BAlert("About", g_aboutText, "OK");
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
             break;
-
+        }
         case MediaRoutingView::M_GROUP_SELECTED:
             _handleGroupSelected(pMsg);
             break;

src/apps/cortex/addons/common/MediaNodeControlApp.cpp

@@ -84 +84 @@
         sprintf(buffer,
             "MediaNodeControlApp: couldn't find node (%ld):\n%s\n",
             nodeID, strerror(err));
-        (new BAlert("error", buffer, "OK"))->Go();
+        BAlert* alert = new BAlert("error", buffer, "OK");
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
         return;
     }
     
@@ -96 +98 @@
         sprintf(buffer,
             "MediaNodeControlApp: couldn't get node info (%ld):\n%s\n",
             nodeID, strerror(err));
-        (new BAlert("error", buffer, "OK"))->Go();
+        BAlert* alert = new BAlert("error", buffer, "OK");
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
         return;
     }
     
@@ -111 +115 @@
         sprintf(buffer,
             "MediaNodeControlApp: no parameters for node (%ld):\n%s\n",
             nodeID, strerror(err));
-        (new BAlert("error", buffer, "OK"))->Go();
+        BAlert* alert = new BAlert("error", buffer, "OK");
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
         return;
     }
     

src/apps/diskprobe/AttributeWindow.cpp

@@ -278 +278 @@
         case kMsgRemoveAttribute:
         {
             char buffer[1024];
+
             snprintf(buffer, sizeof(buffer),
                 B_TRANSLATE("Do you really want to remove the attribute \"%s\" from "
                 "the file \"%s\"?\n\nYou cannot undo this action."),
                 fAttribute, Ref().name);
 
-            int32 chosen = (new BAlert(B_TRANSLATE("DiskProbe request"),
+            BAlert* alert = new BAlert(B_TRANSLATE("DiskProbe request"),
                 buffer, B_TRANSLATE("Cancel"), B_TRANSLATE("Remove"), NULL,
-                B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+                B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+            alert->SetShortcut(0, B_ESCAPE);
+            int32 chosen = alert->Go();
+
             if (chosen == 1) {
                 BNode node(&Ref());
                 if (node.InitCheck() == B_OK)

src/apps/diskprobe/DiskProbe.cpp

@@ -367 +367 @@
                 "error message is shown."),
                 ref.name, strerror(status));
 
-            (new BAlert(B_TRANSLATE("DiskProbe request"),
+            BAlert* alert = new BAlert(B_TRANSLATE("DiskProbe request"),
                 buffer, B_TRANSLATE("OK"), NULL, NULL,
-                B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
+                B_WIDTH_AS_USUAL, B_STOP_ALERT);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
         }
     }
 }

src/apps/diskprobe/ProbeView.cpp

@@ -1105 +1105 @@
         if (system_time() > startTime + 8000000LL) {
             // If the user had to wait more than 8 seconds for the result,
             // we are trying to please him with a requester...
-            (new BAlert(B_TRANSLATE("DiskProbe request"),
+            BAlert* alert = new BAlert(B_TRANSLATE("DiskProbe request"),
                 B_TRANSLATE("Could not find search string."), 
                 B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL, 
-                B_WARNING_ALERT))->Go(NULL);
+                B_WARNING_ALERT);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go(NULL);
         } else
             beep();
     }
@@ -1867 +1869 @@
         "All changes will be lost when you quit."),
         strerror(status));
 
-    (new BAlert(B_TRANSLATE("DiskProbe request"),
+    BAlert* alert = new BAlert(B_TRANSLATE("DiskProbe request"),
         buffer, B_TRANSLATE("OK"), NULL, NULL,
-        B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go(NULL);
+        B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
+    alert->Go(NULL);
 
     return status;
 }
@@ -1883 +1887 @@
     if (!fEditor.IsModified())
         return true;
 
-    int32 chosen = (new BAlert(B_TRANSLATE("DiskProbe request"),
-        B_TRANSLATE("Save changes before closing?"), B_TRANSLATE("Don't save"), B_TRANSLATE("Cancel"), 
-        B_TRANSLATE("Save"),    B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+    BAlert* alert = new BAlert(B_TRANSLATE("DiskProbe request"),
+        B_TRANSLATE("Save changes before closing?"), B_TRANSLATE("Don't save"),
+        B_TRANSLATE("Cancel"), B_TRANSLATE("Save"), B_WIDTH_AS_USUAL,
+        B_WARNING_ALERT);
+    alert->SetShortcut(1, B_ESCAPE);
+    int32 chosen = alert->Go();
 
     if (chosen == 0)
         return true;

src/apps/drivesetup/MainWindow.cpp

@@ -657 +657 @@
 
     BAlert* alert = new BAlert("error", message, B_TRANSLATE("OK"), NULL, NULL,
         B_WIDTH_FROM_WIDEST, error < B_OK ? B_STOP_ALERT : B_INFO_ALERT);
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go(NULL);
 }
 
@@ -820 +821 @@
     BAlert* alert = new BAlert("first notice", message,
         B_TRANSLATE("Continue"), B_TRANSLATE("Cancel"), NULL,
         B_WIDTH_FROM_WIDEST, B_WARNING_ALERT);
+    alert->SetShortcut(1, B_ESCAPE);
     int32 choice = alert->Go();
 
     if (choice == 1)
@@ -917 +919 @@
     alert = new BAlert("final notice", message,
         B_TRANSLATE("Write changes"), B_TRANSLATE("Cancel"), NULL,
         B_WIDTH_FROM_WIDEST, B_WARNING_ALERT);
+    alert->SetShortcut(1, B_ESCAPE);
     choice = alert->Go();
 
     if (choice == 1)
@@ -1024 +1027 @@
         "All data on the partition will be irretrievably lost if you do "
         "so!"), B_TRANSLATE("Write changes"), B_TRANSLATE("Cancel"), NULL,
         B_WIDTH_FROM_WIDEST, B_WARNING_ALERT);
+    alert->SetShortcut(1, B_ESCAPE);
     int32 choice = alert->Go();
 
     if (choice == 1)
@@ -1103 +1107 @@
         "All data on the partition will be irretrievably lost if you "
         "do so!"), B_TRANSLATE("Delete partition"), B_TRANSLATE("Cancel"), NULL,
         B_WIDTH_FROM_WIDEST, B_WARNING_ALERT);
+    alert->SetShortcut(1, B_ESCAPE);
     int32 choice = alert->Go();
 
     if (choice == 1)

src/apps/expander/ExpanderWindow.cpp

@@ -153 +153 @@
             B_TRANSLATE("The destination folder does not exist."),
             B_TRANSLATE("Cancel"), NULL, NULL,
             B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_WARNING_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         return false;
     } else if (!entry.IsDirectory()) {
-        (new BAlert("destAlert",
+        BAlert* alert = new BAlert("destAlert",
             B_TRANSLATE("The destination is not a folder."),
             B_TRANSLATE("Cancel"), NULL, NULL,
-            B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_WARNING_ALERT))->Go();
+            B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_WARNING_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();    
         return false;
     } else if (entry.GetVolume(&volume) != B_OK || volume.IsReadOnly()) {
-        (new BAlert("destAlert",
+        BAlert* alert = new BAlert("destAlert",
             B_TRANSLATE("The destination is read only."),
             B_TRANSLATE("Cancel"), NULL, NULL, B_WIDTH_AS_USUAL,
-            B_EVEN_SPACING, B_WARNING_ALERT))->Go();
+            B_EVEN_SPACING, B_WARNING_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
         return false;
     } else {
         entry.GetRef(&fDestRef);
@@ -246 +251 @@
                         "archive? The expanded items may not be complete."),
                     B_TRANSLATE("Stop"), B_TRANSLATE("Continue"), NULL,
                     B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_WARNING_ALERT);
+                alert->SetShortcut(0, B_ESCAPE);
                 if (alert->Go() == 0) {
                     fExpandingThread->ResumeExternalExpander();
                     StopExpanding();
@@ -280 +286 @@
                     B_TRANSLATE("The file doesn't exist"),
                     B_TRANSLATE("Cancel"), NULL, NULL,
                     B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_WARNING_ALERT);
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
                 alert->Go();
                 break;
             }
@@ -303 +310 @@
             BAlert* alert = new BAlert("srcAlert", string.String(),
                 B_TRANSLATE("Cancel"),
                 NULL, NULL, B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_INFO_ALERT);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             alert->Go();
 
             fShowContents->SetEnabled(false);
@@ -369 +377 @@
                     BAlert* alert = new BAlert("stopAlert", string,
                         B_TRANSLATE("Stop"), B_TRANSLATE("Continue"), NULL,
                         B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_WARNING_ALERT);
+                    alert->SetShortcut(0, B_ESCAPE);
                     if (alert->Go() == 0) {
                         fExpandingThread->ResumeExternalExpander();
                         StopExpanding();
@@ -422 +431 @@
                 "archive? The expanded items may not be complete."),
             B_TRANSLATE("Stop"), B_TRANSLATE("Continue"), NULL,
             B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_WARNING_ALERT);
+            alert->SetShortcut(0, B_ESCAPE);
         if (alert->Go() == 0) {
             fExpandingThread->ResumeExternalExpander();
             StopExpanding();
@@ -558 +568 @@
         B_TRANSLATE("The folder was either moved, renamed or not\nsupported."),
         B_TRANSLATE("Cancel"), NULL, NULL,
             B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_WARNING_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         return;
     }

src/apps/glteapot/ObjectView.cpp

@@ -177 +177 @@
         BAlert *NoResourceAlert = new BAlert(B_TRANSLATE("Error"),
                         kNoResourceError, B_TRANSLATE("OK"), NULL, NULL,
                         B_WIDTH_AS_USUAL, B_OFFSET_SPACING, B_STOP_ALERT);
+        NoResourceAlert->SetFlags(B_CLOSE_ON_ESCAPE);
         NoResourceAlert->Go();
         delete Tri;
     }
@@ -323 +324 @@
                 BAlert *NoResourceAlert = new BAlert(B_TRANSLATE("Error"),
                         kNoResourceError, B_TRANSLATE("OK"), NULL, NULL,
                         B_WIDTH_AS_USUAL, B_OFFSET_SPACING, B_STOP_ALERT);
+                NoResourceAlert->SetFlags(B_CLOSE_ON_ESCAPE);
                 NoResourceAlert->Go();
                 delete Tri;
             }

src/apps/icon-o-matic/MainWindow.cpp

@@ -718 +718 @@
                 "Cancel button - error alert"), 
             NULL, NULL);
         // launch alert asynchronously
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go(NULL);
 
         delete icon;
@@ -796 +797 @@
                     "Cancel button - error alert"), 
                 NULL, NULL);
             // launch alert asynchronously
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             alert->Go(NULL);
 
             delete icon;
@@ -1273 +1275 @@
 
     BAlert* alert = new BAlert("save", 
         B_TRANSLATE("Save changes to current icon?"), B_TRANSLATE("Discard"),
-         B_TRANSLATE("Cancel"), B_TRANSLATE("Save"));
+            B_TRANSLATE("Cancel"), B_TRANSLATE("Save"));
+    alert->SetShortcut(0, B_ESCAPE);
     int32 choice = alert->Go();
     switch (choice) {
         case 0:

src/apps/icon-o-matic/gui/SavePanel.cpp

@@ -365 +365 @@
 //  status_t err = roster->MakeConfigurationView(item->id, NULL, &view, &rect);
 //  if (err < B_OK || view == NULL) {
 //      BAlert *alert = new BAlert(NULL, strerror(err), "OK");
+//      alert->SetFlags(B_CLOSE_ON_ESCAPE);
 //      alert->Go();
 //  } else {
 //      if (fConfigWindow != NULL) {

src/apps/icon-o-matic/import_export/Exporter.cpp

@@ -116 +116 @@
                 "Exporter - Continue in error dialog"), 
             NULL, NULL);
         // launch alert asynchronously
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go(NULL);
     } else {
         // success

src/apps/icon-o-matic/import_export/svg/SVGExporter.cpp

@@ -164 +164 @@
                                "be lost."),
                                B_TRANSLATE("Cancel"), 
                                B_TRANSLATE("Overwrite"));
+    alert->SetShortcut(0, B_ESCAPE);
     return alert->Go() == 1;
 }
 

src/apps/icon-o-matic/import_export/svg/SVGImporter.cpp

@@ -80 +80 @@
         BAlert* alert = new BAlert(B_TRANSLATE("load error"),
                                    error, B_TRANSLATE("OK"), NULL, NULL,
                                    B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go(NULL);
         ret = B_ERROR;
     }

src/apps/installedpackages/UninstallView.cpp

@@ -257 +257 @@
                     "been corrupted."), B_TRANSLATE("OK"), NULL,
                     NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
             }
-
+            notify->SetFlags(B_CLOSE_ON_ESCAPE);
             notify->Go();
         }
         default:

src/apps/installer/InstallerApp.cpp

@@ -82 +82 @@
     BAlert *alert = new BAlert("about", B_TRANSLATE("Installer\n"
         "\twritten by Jérôme Duval and Stephan Aßmus\n"
         "\tCopyright 2005-2010, Haiku.\n\n"), B_TRANSLATE("OK"));
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     BTextView *view = alert->TextView();
     BFont font;
 

src/apps/installer/InstallerWindow.cpp

@@ -346 +346 @@
                     B_TRANSLATE("An error was encountered and the "
                     "installation was not completed:\n\n"
                     "Error:  %s"), strerror(error));
-                (new BAlert("error", errorMessage, B_TRANSLATE("OK")))->Go();
+                BAlert* alert = new BAlert("error", errorMessage, B_TRANSLATE("OK"));
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
+                alert->Go();
             }
 
             _DisableInterface(false);
@@ -426 +428 @@
         }
         case ENCOURAGE_DRIVESETUP:
         {
-            (new BAlert("use drive setup", B_TRANSLATE("No partitions have "
+            BAlert* alert = new BAlert("use drive setup", B_TRANSLATE("No partitions have "
                 "been found that are suitable for installation. Please set "
                 "up partitions and initialize at least one partition with the "
-                "Be File System."), B_TRANSLATE("OK")))->Go();
+                "Be File System."), B_TRANSLATE("OK"));
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
             break;
         }
         case MSG_STATUS_MESSAGE:
@@ -575 +579 @@
         // thing on the screen and we will reboot the machine once it quits.
 
         if (fDriveSetupLaunched && fBootManagerLaunched) {
-            (new BAlert(B_TRANSLATE("Quit Boot Manager and DriveSetup"),
-                B_TRANSLATE("Please close the Boot Manager and DriveSetup "
-                    "windows before closing the Installer window."),
-                B_TRANSLATE("OK")))->Go();
+            BAlert* alert = new BAlert(B_TRANSLATE("Quit Boot Manager and "
+                "DriveSetup"),  B_TRANSLATE("Please close the Boot Manager "
+                "and DriveSetup windows before closing the Installer window."),
+                B_TRANSLATE("OK"));
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
             return false;
         }
         if (fDriveSetupLaunched) {
-            (new BAlert(B_TRANSLATE("Quit DriveSetup"),
-                B_TRANSLATE("Please close the DriveSetup window before closing "
-                    "the Installer window."), B_TRANSLATE("OK")))->Go();
+            BAlert* alert = new BAlert(B_TRANSLATE("Quit DriveSetup"),
+                B_TRANSLATE("Please close the DriveSetup window before "
+                "closing the Installer window."), B_TRANSLATE("OK"));
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
             return false;
         }
         if (fBootManagerLaunched) {
-            (new BAlert(B_TRANSLATE("Quit Boot Manager"),
+            BAlert* alert = new BAlert(B_TRANSLATE("Quit Boot Manager"),
                 B_TRANSLATE("Please close the Boot Manager window before "
-                    "closing the Installer window."), B_TRANSLATE("OK")))->Go();
+                "closing the Installer window."), B_TRANSLATE("OK"));
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
             return false;
         }
-
-        if (fInstallStatus != kFinished
-            && (new BAlert(B_TRANSLATE_SYSTEM_NAME("Installer"),
-                    B_TRANSLATE("Are you sure you want to abort the "
-                        "installation and restart the system?"),
-                    B_TRANSLATE("Cancel"), B_TRANSLATE("Restart system"), NULL,
-                    B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go() == 0) {
-            return false;
+        if (fInstallStatus != kFinished) {
+            BAlert* alert = new BAlert(B_TRANSLATE_SYSTEM_NAME("Installer"),
+                B_TRANSLATE("Are you sure you want to abort the "
+                    "installation and restart the system?"),
+                B_TRANSLATE("Cancel"), B_TRANSLATE("Restart system"), NULL,
+                B_WIDTH_AS_USUAL, B_STOP_ALERT);
+            alert->SetShortcut(0, B_ESCAPE);
+            if (alert->Go() == 0)
+                return false;
         }
-    } else if (fInstallStatus == kInstalling
-        && (new BAlert(B_TRANSLATE_SYSTEM_NAME("Installer"),
-            B_TRANSLATE("Are you sure you want to abort the installation?"),
-            B_TRANSLATE("Cancel"), B_TRANSLATE("Abort"), NULL,
-            B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go() == 0) {
-        return false;
+    } else if (fInstallStatus == kInstalling) {
+            BAlert* alert = new BAlert(B_TRANSLATE_SYSTEM_NAME("Installer"),
+                B_TRANSLATE("Are you sure you want to abort the installation?"),
+                B_TRANSLATE("Cancel"), B_TRANSLATE("Abort"), NULL,
+                B_WIDTH_AS_USUAL, B_STOP_ALERT);
+            alert->SetShortcut(0, B_ESCAPE);
+            if (alert->Go() == 0)
+                return false;
     }
 
     _QuitCopyEngine(false);
@@ -648 +661 @@
             BAlert* alert = new BAlert("error", B_TRANSLATE("DriveSetup, the "
                 "application to configure disk partitions, could not be "
                 "launched."), B_TRANSLATE("OK"));
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             alert->Go();
         }
     }
@@ -676 +690 @@
             BAlert* alert = new BAlert("error", B_TRANSLATE("BootManager, the "
                 "application to configure the Haiku boot menu, could not be "
                 "launched."), B_TRANSLATE("OK"));
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             alert->Go();
         }
     }
@@ -876 +891 @@
 
     bool quit = true;
     if (askUser) {
-        quit = (new BAlert("cancel",
+        BAlert* alert = new BAlert("cancel",
             B_TRANSLATE("Are you sure you want to to stop the installation?"),
             B_TRANSLATE_COMMENT("Continue", "In alert after pressing Stop"),
             B_TRANSLATE_COMMENT("Stop", "In alert after pressing Stop"), 0,
-            B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go() != 0;
+            B_WIDTH_AS_USUAL, B_STOP_ALERT);
+        alert->SetShortcut(1, B_ESCAPE);
+        quit = alert->Go();
     }
 
     if (quit) {

src/apps/installer/WorkerThread.cpp

@@ -316 +316 @@
         goto error; // shouldn't happen
 
     // check if target has enough space
-    if ((fSpaceRequired > 0 && targetVolume.FreeBytes() < fSpaceRequired)
-        && ((new BAlert("", B_TRANSLATE("The destination disk may not have "
-            "enough space. Try choosing a different disk or choose to not "
-            "install optional items."), B_TRANSLATE("Try installing anyway"),
-            B_TRANSLATE("Cancel"), 0,
-            B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go() != 0)) {
-        goto error;
+    if (fSpaceRequired > 0 && targetVolume.FreeBytes() < fSpaceRequired) {
+        BAlert* alert = new BAlert("", B_TRANSLATE("The destination disk may "
+            "not have enough space. Try choosing a different disk or choose "
+            "to not install optional items."),
+            B_TRANSLATE("Try installing anyway"), B_TRANSLATE("Cancel"), 0,
+            B_WIDTH_AS_USUAL, B_STOP_ALERT);
+        alert->SetShortcut(1, B_ESCAPE);
+        if (alert->Go() != 0)
+                goto error;
     }
 
     if (fDDRoster.GetPartitionWithID(srcItem->ID(), &device, &partition) == B_OK) {
@@ -346 +348 @@
     }
 
     // check not installing on boot volume
-    if ((strncmp(BOOT_PATH, targetDirectory.Path(), strlen(BOOT_PATH)) == 0)
-        && ((new BAlert("", B_TRANSLATE("Are you sure you want to install "
-            "onto the current boot disk? The Installer will have to reboot "
-            "your machine if you proceed."), B_TRANSLATE("OK"),
-            B_TRANSLATE("Cancel"), 0,
-            B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go() != 0)) {
-        _SetStatusMessage("Installation stopped.");
-        goto error;
+    if (strncmp(BOOT_PATH, targetDirectory.Path(), strlen(BOOT_PATH)) == 0) {
+        BAlert* alert = new BAlert("", B_TRANSLATE("Are you sure you want to "
+            "install onto the current boot disk? The Installer will have to "
+            "reboot your machine if you proceed."), B_TRANSLATE("OK"),
+            B_TRANSLATE("Cancel"), 0, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+        alert->SetShortcut(1, B_ESCAPE);
+        if (alert->Go() != 0) {
+            _SetStatusMessage("Installation stopped.");
+            goto error;
+        }
     }
 
     // check if target volume's trash dir has anything in it
@@ -376 +380 @@
             entries++;
     }
 
-    if (entries != 0
-        && ((new BAlert("", B_TRANSLATE("The target volume is not empty. Are "
-            "you sure you want to install anyway?\n\nNote: The 'system' folder "
-            "will be a clean copy from the source volume, all other folders "
-            "will be merged, whereas files and links that exist on both the "
-            "source and target volume will be overwritten with the source "
-            "volume version."),
+    if (entries != 0) {
+        BAlert* alert = new BAlert("", B_TRANSLATE("The target volume is not "
+            "empty. Are you sure you want to install anyway?\n\nNote: The "
+            "'system' folder will be a clean copy from the source volume, all "
+            "other folders will be merged, whereas files and links that exist "
+            "on both the source and target volume will be overwritten with "
+            "the source volume version."),
             B_TRANSLATE("Install anyway"), B_TRANSLATE("Cancel"), 0,
-            B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go() != 0)) {
+            B_WIDTH_AS_USUAL, B_STOP_ALERT);
+        alert->SetShortcut(1, B_ESCAPE);
+        if (alert->Go() != 0) {
         // TODO: Would be cool to offer the option here to clean additional
         // folders at the user's choice (like /boot/common and /boot/develop).
-        err = B_CANCELED;
-        goto error;
+            err = B_CANCELED;
+            goto error;
+        }
     }
 
     // Begin actual installation

src/apps/launchbox/MainWindow.cpp

@@ -98 +98 @@
             B_TRANSLATE("Really close this pad?\n"
                         "(The pad will not be remembered.)"),
             B_TRANSLATE("Close"), B_TRANSLATE("Cancel"), NULL);
+        alert->SetShortcut(1, B_ESCAPE);
         if (alert->Go() == 1)
             return false;
     }
@@ -172 +173 @@
             if (errorMessage.Length() > 0) {
                 BAlert* alert = new BAlert("error", errorMessage.String(),
                     B_TRANSLATE("Bummer"), NULL, NULL, B_WIDTH_FROM_WIDEST);
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
                 alert->Go(NULL);
             }
             break;

src/apps/login/LoginApp.cpp

@@ -51 +51 @@
     BScreen screen;
 
     if (fEditShelfMode) {
-        (new BAlert(B_TRANSLATE("Info"), B_TRANSLATE("You can customize the "
+        BAlert* alert = new BAlert(B_TRANSLATE("Info"), B_TRANSLATE("You can customize the "
             "desktop shown behind the Login application by dropping replicants"
             " onto it.\n"
             "\n"
             "When you are finished just quit the application (Alt-Q)."),
-            B_TRANSLATE("OK")))->Go(NULL);
+            B_TRANSLATE("OK"));
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go(NULL);
     } else {
         BRect frame(0, 0, 450, 150);
         frame.OffsetBySelf(screen.Frame().Width()/2 - frame.Width()/2,
@@ -94 +96 @@
             if (error < B_OK) {
                 BString msg(B_TRANSLATE("Error: %1"));
                 msg.ReplaceFirst("%1", strerror(error));
-                (new BAlert(("Error"), msg.String(), B_TRANSLATE("OK")))->Go();
+                BAlert* alert = new BAlert(("Error"), msg.String(),
+                    B_TRANSLATE("OK"));
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
+                alert->Go();
             }
             break;
         }
         case kSuspendAction:
-            (new BAlert(B_TRANSLATE("Error"), B_TRANSLATE("Unimplemented"),
-                B_TRANSLATE("OK")))->Go();
+        {
+            BAlert* alert = new BAlert(B_TRANSLATE("Error"),
+                B_TRANSLATE("Unimplemented"), B_TRANSLATE("OK"));
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
             break;
+        }
 #endif
     default:
         BApplication::MessageReceived(message);

src/apps/mail/Content.cpp

@@ -755 +755 @@
                 free (signature);
             } else {
                 beep();
-                (new BAlert("",
+                BAlert* alert = new BAlert("",
                     B_TRANSLATE("An error occurred trying to open this "
-                        "signature."),
-                    B_TRANSLATE("Sorry")))->Go();
+                        "signature."), B_TRANSLATE("Sorry"));
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
+                alert->Go();
             }
             break;
         }
@@ -1914 +1915 @@
             status_t result = be_roster->Launch(handlerToLaunch, 1, &enclosure->name);
             if (result != B_NO_ERROR && result != B_ALREADY_RUNNING) {
                 beep();
-                (new BAlert("",
+                BAlert* alert = new BAlert("",
                     B_TRANSLATE("There is no installed handler for "
-                        "URL links."),
-                    "Sorry"))->Go();
+                        "URL links."), B_TRANSLATE("Sorry"));
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
+                alert->Go();
             }
             break;
         }
@@ -2065 +2067 @@
 
     if (result != B_NO_ERROR) {
         beep();
-        (new BAlert("", B_TRANSLATE("An error occurred trying to save "
-                "the attachment."),
-            B_TRANSLATE("Sorry")))->Go();
+        BAlert* alert = new BAlert("", B_TRANSLATE("An error occurred trying to save "
+                "the attachment."), B_TRANSLATE("Sorry"));
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
     }
 
     return result;
@@ -3337 +3340 @@
                     Select(offset, offset + length);
                 } else {
                     ::beep();
-                    (new BAlert("",
+                    BAlert* alert = new BAlert("",
                         B_TRANSLATE("Inconsistency occurred in the undo/redo "
-                            "buffer."),
-                        B_TRANSLATE("OK")))->Go();
+                            "buffer."), B_TRANSLATE("OK"));
+                    alert->SetFlags(B_CLOSE_ON_ESCAPE);
+                    alert->Go();
                 }
                 break;
         }
@@ -3384 +3388 @@
 
             case K_REPLACED:
                 ::beep();
-                (new BAlert("",
+                BAlert* alert = new BAlert("",
                     B_TRANSLATE("Inconsistency occurred in the undo/redo "
-                        "buffer."),
-                    B_TRANSLATE("OK")))->Go();
+                        "buffer."), B_TRANSLATE("OK"));
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
+                alert->Go();
                 break;
         }
         ScrollToSelection();

src/apps/mail/Enclosures.cpp

@@ -249 +249 @@
                     if (window && window->Mail())
                         window->Mail()->RemoveComponent(item->Component());
 
-                    (new BAlert("", B_TRANSLATE(
+                    BAlert* alert = new BAlert("", B_TRANSLATE(
                         "Removing attachments from a forwarded mail is not yet "
                         "implemented!\nIt will not yet work correctly."),
-                        B_TRANSLATE("OK")))->Go();
+                        B_TRANSLATE("OK"));
+                    alert->SetFlags(B_CLOSE_ON_ESCAPE);
+                    alert->Go();
                 }
                 else
                     watch_node(item->NodeRef(), B_STOP_WATCHING, this);
@@ -302 +304 @@
                 if (badType)
                 {
                     beep();
-                    (new BAlert("",
+                    BAlert* alert = new BAlert("",
                         B_TRANSLATE("Only files can be added as attachments."),
-                        B_TRANSLATE("OK")))->Go();
+                        B_TRANSLATE("OK"));
+                    alert->SetFlags(B_CLOSE_ON_ESCAPE);
+                    alert->Go();
                 }
             }
             break;

src/apps/mail/MailWindow.cpp

@@ -1177 +1177 @@
                         msg.AddRef("refs", fRef);
                         tracker.SendMessage(&msg);
                     } else {
-                        (new BAlert("",
+                        BAlert* alert = new BAlert("",
                             B_TRANSLATE("Need Tracker to move items to trash"),
-                            B_TRANSLATE("Sorry")))->Go();
+                            B_TRANSLATE("Sorry"));
+                        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+                        alert->Go();
                     }
                 }
             } else {
@@ -1344 +1346 @@
                     1, &arg);
 
                 if (result != B_NO_ERROR) {
-                    (new BAlert("", B_TRANSLATE(
+                    BAlert* alert = new BAlert("", B_TRANSLATE(
                         "Sorry, could not find an application that "
                         "supports the 'Person' data type."),
-                        B_TRANSLATE("OK")))->Go();
+                        B_TRANSLATE("OK"));
+                    alert->SetFlags(B_CLOSE_ON_ESCAPE);
+                    alert->Go();
                 }
-
             }
-
             free(arg);
             break;
         }
@@ -1581 +1583 @@
                 snooze (1500000);
             if (!gDictCount) {
                 beep();
-                (new BAlert("",
+                BAlert* alert = new BAlert("",
                     B_TRANSLATE("Mail couldn't find its dictionary."),
                     B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL,
-                    B_OFFSET_SPACING, B_STOP_ALERT))->Go();
+                    B_OFFSET_SPACING, B_STOP_ALERT);
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
+                alert->Go();
             } else {
                 fSpelling->SetMarked(!fSpelling->IsMarked());
                 fContentView->fTextView->EnableSpellCheck(
@@ -1626 +1630 @@
                     B_TRANSLATE("Put your favorite e-mail queries and query "
                     "templates in this folder."), B_TRANSLATE("OK"), NULL, NULL,
                     B_WIDTH_AS_USUAL, B_IDEA_ALERT);
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
                 alert->Go(NULL);
             }
 
@@ -2225 +2230 @@
         status_t status = SaveAsDraft();
         if (status != B_OK) {
             beep();
-            (new BAlert("", B_TRANSLATE("E-mail draft could not be saved!"),
-                B_TRANSLATE("OK")))->Go();
+            BAlert* alert = new BAlert("", B_TRANSLATE("E-mail draft could "
+                "not be saved!"), B_TRANSLATE("OK"));
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
         }
         return status;
     }
@@ -2315 +2322 @@
                         "the unencodable ones), or choose Cancel to go back "
                         "and try fixing it up.");
                     messageString.ReplaceFirst("%ld", countString);
-                    userAnswer = (new BAlert("Question", messageString.String(),
+                    BAlert* alert = new BAlert("Question", messageString.String(),
                         B_TRANSLATE("Send"),
                         B_TRANSLATE("Cancel"),
                         NULL, B_WIDTH_AS_USUAL, B_OFFSET_SPACING,
-                        B_WARNING_ALERT))->Go();
+                        B_WARNING_ALERT);
+                    alert->SetShortcut(1, B_ESCAPE);
+                    userAnswer = alert->Go();
+                    
                     if (userAnswer == 1) {
                         // Cancel was picked.
                         return -1;
@@ -2450 +2460 @@
             close = true;
             fSent = true;
 
-            int32 start = (new BAlert("no daemon",
+            BAlert* alert = new BAlert("no daemon",
                 B_TRANSLATE("The mail_daemon is not running. The message is "
                 "queued and will be sent when the mail_daemon is started."),
-                B_TRANSLATE("Start now"), B_TRANSLATE("OK")))->Go();
-
+                B_TRANSLATE("Start now"), B_TRANSLATE("OK"));
+            alert->SetShortcut(1, B_ESCAPE);
+            int32 start = alert->Go();
+            
             if (start == 0) {
                 result = be_roster->Launch("application/x-vnd.Be-POST");
                 if (result == B_OK) {
@@ -2489 +2501 @@
 
     if (result != B_NO_ERROR && result != B_MAIL_NO_DAEMON) {
         beep();
-        (new BAlert("", errorMessage.String(), B_TRANSLATE("OK")))->Go();
+        BAlert* alert = new BAlert("", errorMessage.String(), B_TRANSLATE("OK"));
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
     }
     if (close) {
         PostMessage(B_QUIT_REQUESTED);
@@ -2721 +2735 @@
     sprintf(errorString, "Unable to train the message file \"%s\" as %s.  "
         "Possibly useful error code: %s (%ld).",
         filePath.Path(), CommandWord, strerror (errorCode), errorCode);
-    (new BAlert("", errorString,
-        B_TRANSLATE("OK")))->Go();
+    BAlert* alert = new BAlert("", errorString, B_TRANSLATE("OK"));
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
+    alert->Go();
+
     return errorCode;
 }
 

src/apps/mail/Signature.cpp

@@ -192 +192 @@
             Save();
             break;
 
-        case M_DELETE:
-            if (!(new BAlert("",
+        case M_DELETE: {
+            BAlert* alert = new BAlert("",
                     B_TRANSLATE("Really delete this signature? This cannot "
                         "be undone."),
                     B_TRANSLATE("Cancel"),
                     B_TRANSLATE("Delete"),
-                    NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go())
+                    NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+            alert->SetShortcut(0, B_ESCAPE);
+            int32 choice = alert->Go();
+            
+            if (choice == 0)
                 break;
 
             if (fFile) {
@@ -210 +214 @@
                 fSigView->fName->MakeFocus(true);
             }
             break;
-
+        }
         case M_SIGNATURE:
             if (Clear()) {
                 msg->FindRef("ref", &ref);
@@ -231 +235 @@
                 else {
                     fFile = NULL;
                     beep();
-                    (new BAlert("",
+                    BAlert* alert = new BAlert("",
                         B_TRANSLATE("Couldn't open this signature. Sorry."),
-                        B_TRANSLATE("OK")))->Go();
+                        B_TRANSLATE("OK"));
+                    alert->SetFlags(B_CLOSE_ON_ESCAPE);
+                    alert->Go();
                 }
             }
             break;
@@ -385 +391 @@
 
 err_exit:
     beep();
-    (new BAlert("",
+    BAlert* alert = new BAlert("",
         B_TRANSLATE("An error occurred trying to save this signature."),
-        B_TRANSLATE("Sorry")))->Go();
+        B_TRANSLATE("Sorry"));
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
+    alert->Go();
 }
 
 

src/apps/mediaconverter/MediaConverterApp.cpp

@@ -146 +146 @@
         BAlert* alert = new BAlert((errors > 1) ? 
             B_TRANSLATE("Error loading files") : 
             B_TRANSLATE("Error loading a file"), 
-            alertText.String(), B_TRANSLATE("Continue") , NULL, NULL, 
+            alertText.String(), B_TRANSLATE("Continue"), NULL, NULL, 
             B_WIDTH_AS_USUAL, B_STOP_ALERT);
         alert->Go();
     }

src/apps/mediaconverter/MediaConverterWindow.cpp

@@ -428 +428 @@
             if (status != B_OK && status != B_ALREADY_RUNNING) {
                 BString errorString(B_TRANSLATE("Error launching: %strError%"));
                 errorString.ReplaceFirst("%strError%", strerror(status));
-                (new BAlert(B_TRANSLATE("Error"), errorString.String(), 
-                    B_TRANSLATE("OK")))->Go();
+                BAlert* alert = new BAlert(B_TRANSLATE("Error"),
+                    errorString.String(), B_TRANSLATE("OK"));
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
+                alert->Go();
             }
             break;
         }

src/apps/mediaconverter/MediaFileInfoView.cpp

@@ -165 +165 @@
             BAlert* alert = new BAlert(
                 B_TRANSLATE("File Error"), error.String(),
                 B_TRANSLATE("OK"));
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             alert->Go(NULL);
         }
     } else {

src/apps/mediaplayer/MainApp.cpp

@@ -93 +93 @@
             "Would you like to start it ?"), B_TRANSLATE("Quit"),
             B_TRANSLATE("Start media server"), NULL,
             B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        alert->SetShortcut(0, B_ESCAPE);
+        
         if (alert->Go() == 0) {
             PostMessage(B_QUIT_REQUESTED);
             return;

src/apps/mediaplayer/MainWin.cpp

@@ -633 +633 @@
             BAlert* alert = new BAlert(B_TRANSLATE("Nothing to Play"),
                 B_TRANSLATE("None of the files you wanted to play appear "
                 "to be media files."), B_TRANSLATE("OK"));
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             alert->Go();
             fControls->SetDisabledString(kDisabledSeekMessage);
             break;
@@ -1090 +1091 @@
         BString message = B_TRANSLATE("%app% encountered an internal error. "
             "The file could not be opened.");
         message.ReplaceFirst("%app%", kApplicationName);
-        (new BAlert(kApplicationName, message.String(),
-            B_TRANSLATE("OK")))->Go();
+        BAlert* alert = new BAlert(kApplicationName, message.String(),
+            B_TRANSLATE("OK"));
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
         _PlaylistItemOpened(item, ret);
     } else {
         BString string;
@@ -1337 +1340 @@
             } else {
                 message << B_TRANSLATE("Error: ") << strerror(result);
             }
-            (new BAlert("error", message.String(), B_TRANSLATE("OK")))->Go();
+            BAlert* alert = new BAlert("error", message.String(),
+                B_TRANSLATE("OK"));
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
             fControls->SetDisabledString(kDisabledSeekMessage);
         } else {
             // Just go to the next file and don't bother user (yet)

src/apps/mediaplayer/playlist/PlaylistWindow.cpp

@@ -57 +57 @@
 {
     BAlert* alert = new BAlert(B_TRANSLATE("Save error"), message, 
         B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go(NULL);
 }
 

src/apps/mediaplayer/playlist/RemovePLItemsCommand.cpp

@@ -118 +118 @@
                 message << 
                     B_TRANSLATE("Some files could not be moved into Trash.");
             message << "\n\n" << B_TRANSLATE("Error: ") << strerror(moveError);
-            (new BAlert(B_TRANSLATE("Move Into Trash Error"), message.String(),
-                B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL,
-                B_WARNING_ALERT))->Go(NULL);
+            BAlert* alert = new BAlert(B_TRANSLATE("Move into trash error"),
+                message.String(), B_TRANSLATE("OK"), NULL, NULL,
+                B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go(NULL);
         }
     }
 

src/apps/midiplayer/MidiPlayerApp.cpp

@@ -48 +48 @@
 void
 MidiPlayerApp::AboutRequested()
 {
-    (new BAlert(
-        NULL,
+    BAlert* alert = new BAlert(NULL,
         B_TRANSLATE_COMMENT("Haiku MIDI Player 1.0.0 beta\n\n"
         "This tiny program\n"
         "Knows how to play thousands of\n"
-        "Cheesy sounding songs", "This is a haiku. First line has five syllables, second has seven and last has five again. Create your own."),
-        "Okay", NULL, NULL,
-        B_WIDTH_AS_USUAL, B_INFO_ALERT))->Go();
+        "Cheesy sounding songs", "This is a haiku. First line has five "
+        "syllables, second has seven and last has five again. "
+        "Create your own."), B_TRANSLATE("OK"), NULL, NULL,
+        B_WIDTH_AS_USUAL, B_INFO_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
 }
 
 

src/apps/midiplayer/MidiPlayerWindow.cpp

@@ -381 +381 @@
         scopeView->SetPlaying(false);
         scopeView->Invalidate();
 
-        (new BAlert(NULL, B_TRANSLATE("Could not load song"),
+        BAlert* alert = new BAlert(NULL, B_TRANSLATE("Could not load song"),
             B_TRANSLATE("OK"), NULL, NULL,
-            B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
+            B_WIDTH_AS_USUAL, B_STOP_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
     }
 }
 

src/apps/networkstatus/NetworkStatus.cpp

@@ -156 +156 @@
             "in a window or install it in the Deskbar."),
             B_TRANSLATE("Run in window"), B_TRANSLATE("Install in Deskbar"),
             NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-        alert->SetShortcut(0, B_ESCAPE);
 
         if (alert->Go() == 1) {
             _InstallReplicantInDeskbar();

src/apps/networkstatus/NetworkStatusView.cpp

@@ -298 +298 @@
                     BAlert* alert = new BAlert(name, text.String(),
                         B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL,
                         B_STOP_ALERT);
+                    alert->SetFlags(B_CLOSE_ON_ESCAPE);
                     alert->Go(NULL);
                 }
             }
@@ -401 +402 @@
     }
 
     BAlert* alert = new BAlert(name, text.String(), B_TRANSLATE("OK"));
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     BTextView* view = alert->TextView();
     BFont font;
 
@@ -509 +511 @@
     about.ReplaceFirst("%2", "Copyright 2007-2010");
         // Append a new year here
     BAlert* alert = new BAlert("about", about, B_TRANSLATE("OK"));
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     BTextView *view = alert->TextView();
     BFont font;
 
@@ -602 +605 @@
         errorMessage << strerror(status);
         BAlert* alert = new BAlert("launch error", errorMessage.String(),
             B_TRANSLATE("OK"));
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
 
         // asynchronous alert in order to not block replicant host application
         alert->Go(NULL);

src/apps/overlayimage/OverlayView.cpp

@@ -159 +159 @@
         "originally by Seth Flaxman\n\t"
         "modified by Hartmuth Reh\n\t"
         "further modified by Humdinger\n",
-        "OK");
-
+        "OK");  
     BTextView *view = alert->TextView();
     BFont font;
     view->SetStylable(true);
@@ -168 +167 @@
     font.SetSize(font.Size() + 7.0f);
     font.SetFace(B_BOLD_FACE);
     view->SetFontAndColor(0, 12, &font);
-    
+    alert->SetFlags(B_CLOSE_ON_ESCAPE); 
     alert->Go();
 }

src/apps/packageinstaller/PackageInfo.cpp

@@ -1044 +1044 @@
                 B_TRANSLATE("Continue"),
                 B_TRANSLATE("Abort"), NULL,
             B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        warning->SetShortcut(1, B_ESCAPE);
         selection = warning->Go();
 
         if (selection == 1) {

src/apps/packageinstaller/PackageInstall.cpp

@@ -125 +125 @@
                 "and continue the installation?"),
             B_TRANSLATE("Continue"),
             B_TRANSLATE("Abort"));
+        reinstall->SetShortcut(1, B_ESCAPE);
 
         if (reinstall->Go() == 0) {
             // Uninstall the package

src/apps/packageinstaller/PackageView.cpp

@@ -98 +98 @@
                 "possible reasons for this might be that the requested file "
                 "is not a valid BeOS .pkg package."), B_TRANSLATE("OK"),
                 NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        warning->SetFlags(B_CLOSE_ON_ESCAPE);
         warning->Go();
 
         Window()->PostMessage(B_QUIT_REQUESTED);
@@ -195 +196 @@
                 B_TRANSLATE("The package you requested has been successfully "
                     "installed on your system."),
                 B_TRANSLATE("OK"));
+            notify->SetFlags(B_CLOSE_ON_ESCAPE);
 
             notify->Go();
             fStatusWindow->Hide();
@@ -214 +216 @@
                 B_TRANSLATE(
                     "The installation of the package has been aborted."),
                 B_TRANSLATE("OK"));
+            notify->SetFlags(B_CLOSE_ON_ESCAPE);
             notify->Go();
             fStatusWindow->Hide();
             fInstall->SetEnabled(true);
@@ -234 +237 @@
                 NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
             fprintf(stderr,
                 B_TRANSLATE("Error while installing the package\n"));
+            notify->SetFlags(B_CLOSE_ON_ESCAPE);
             notify->Go();
             fStatusWindow->Hide();
             fInstall->SetEnabled(true);
@@ -354 +358 @@
                 B_TRANSLATE("Replace"),
                 B_TRANSLATE("Skip"),
                 B_TRANSLATE("Abort"));
-
+            alert->SetShortcut(2, B_ESCAPE);
+            
             choice = alert->Go();
             switch (choice) {
                 case 0:

src/apps/pairs/PairsView.cpp

@@ -175 +175 @@
             BAlert* alert = new BAlert("Fatal", msgStr.String(),
                 B_TRANSLATE("OK"),  NULL, NULL, B_WIDTH_FROM_WIDEST,
                 B_STOP_ALERT);
-            alert->SetShortcut(0, B_ESCAPE);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             alert->Go();
             exit(1);
         }

src/apps/people/PeopleApp.cpp

@@ -247 +247 @@
                 BAlert* alert = new BAlert(B_TRANSLATE("Error"),
                     errorMsg.String(), B_TRANSLATE("OK"), NULL, NULL,
                     B_WIDTH_AS_USUAL, B_STOP_ALERT);
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
                 alert->Go(NULL);
             }
             break;

src/apps/people/PersonWindow.cpp

@@ -216 +216 @@
                     }
                     else {
                         sprintf(str, B_TRANSLATE("Could not create %s."), name);
-                        (new BAlert("", str, B_TRANSLATE("Sorry")))->Go();
+                        BAlert* alert = new BAlert("", str, B_TRANSLATE("Sorry"));
+                        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+                        alert->Go();
                     }
                 }
             }
@@ -294 +296 @@
     status_t result;
 
     if (!fView->IsSaved()) {
-        result = (new BAlert("", B_TRANSLATE("Save changes before quitting?"),
+        BAlert* alert = new BAlert("", B_TRANSLATE("Save changes before quitting?"),
                             B_TRANSLATE("Cancel"), B_TRANSLATE("Quit"),
-                            B_TRANSLATE("Save")))->Go();
+                            B_TRANSLATE("Save"));
+        alert->SetShortcut(0, B_ESCAPE);
+        result = alert->Go();
+
         if (result == 2) {
             if (fRef)
                 fView->Save();

src/apps/people/PictureView.cpp

@@ -564 +564 @@
             text.ReplaceFirst("%name%", name);
             BAlert* alert = new BAlert(B_TRANSLATE("Error"), text.String(),
                 B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             alert->Go();
         }
     }

src/apps/poorman/PoorManWindow.cpp

@@ -545 +545 @@
 {
     BAlert* serverAlert = new BAlert(B_TRANSLATE("Error Server"), 
         STR_ERR_CANT_START, B_TRANSLATE("OK"));
+    serverAlert->SetFlags(B_CLOSE_ON_ESCAPE);
     BAlert* dirAlert = new BAlert(B_TRANSLATE("Error Dir"), 
         STR_ERR_WEB_DIR, B_TRANSLATE("Cancel"), B_TRANSLATE("Select"), 
         B_TRANSLATE("Default"), B_WIDTH_AS_USUAL, B_OFFSET_SPACING);
@@ -576 +577 @@
             BAlert* dirCreatedAlert =
                 new BAlert(B_TRANSLATE("Dir Created"), STR_DIR_CREATED, 
                     B_TRANSLATE("OK"));
+            dirCreatedAlert->SetFlags(B_CLOSE_ON_ESCAPE);
             dirCreatedAlert->Go();
             SetWebDir(STR_DEFAULT_WEB_DIRECTORY);   
             be_app->PostMessage(kStartServer);

src/apps/powerstatus/PowerStatus.cpp

@@ -90 +90 @@
             "or install it in the Deskbar."), B_TRANSLATE("Run in window"),
             B_TRANSLATE("Install in Deskbar"), NULL, B_WIDTH_AS_USUAL,
             B_WARNING_ALERT);
-        alert->SetShortcut(0, B_ESCAPE);
 
         if (alert->Go()) {
             image_info info;

src/apps/powerstatus/PowerStatusView.cpp

@@ -635 +635 @@
     font.SetFace(B_BOLD_FACE);
     view->SetFontAndColor(0, strlen(B_TRANSLATE("PowerStatus")), &font);
 
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
 }
 

src/apps/processcontroller/PCWorld.cpp

@@ -93 +93 @@
             " or install it in the Deskbar."), B_TRANSLATE("Run in window"),
             B_TRANSLATE("Install in Deskbar"),
             NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-        alert->SetShortcut(0, B_ESCAPE);
 
         if (alert->Go() != 0) {
             BDeskbar deskbar;
@@ -107 +106 @@
             B_TRANSLATE("ProcessController is already installed in Deskbar."),
             B_TRANSLATE("OK"), NULL,
             NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-        alert->SetShortcut(0, B_ESCAPE);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
     }
 

src/apps/processcontroller/Preferences.cpp

@@ -115 +115 @@
             BAlert *alert = new BAlert(B_TRANSLATE("Error saving file"),
                 error.String(), B_TRANSLATE("Damned!"), NULL, NULL,
                 B_WIDTH_AS_USUAL, B_STOP_ALERT);
-            alert->SetShortcut(0, B_ESCAPE);
-
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             alert->Go();
         }
     }

src/apps/processcontroller/ProcessController.cpp

@@ -280 +280 @@
                         B_TRANSLATE("This team is already gone"B_UTF8_ELLIPSIS),
                         B_TRANSLATE("Ok!"), NULL, NULL, B_WIDTH_AS_USUAL,
                         B_STOP_ALERT);
-                    alert->SetShortcut(0, B_ESCAPE);
+                    alert->SetFlags(B_CLOSE_ON_ESCAPE);
                     alert->Go();
                 }
             }
@@ -298 +298 @@
                         B_TRANSLATE("Cancel"), B_TRANSLATE("Debug this thread!"),
                         B_TRANSLATE("Kill this thread!"), B_WIDTH_AS_USUAL,
                         B_STOP_ALERT);
+                    alert->SetShortcut(0, B_ESCAPE);
+
                     #define KILL 2
                     #else
                     snprintf(question, sizeof(question),
@@ -306 +308 @@
                     alert = new BAlert(B_TRANSLATE("Please confirm"), question,
                         B_TRANSLATE("Cancel"), B_TRANSLATE("Kill this thread!"),
                         NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+                    alert->SetShortcut(0, B_ESCAPE);
+                    
                     #define KILL 1
                     #endif
                     alert->SetShortcut(0, B_ESCAPE);
@@ -330 +334 @@
                         B_TRANSLATE("This thread is already gone"B_UTF8_ELLIPSIS),
                         B_TRANSLATE("Ok!"), NULL, NULL,
                         B_WIDTH_AS_USUAL, B_STOP_ALERT);
-                    alert->SetShortcut(0, B_ESCAPE);
+                    alert->SetFlags(B_CLOSE_ON_ESCAPE);
                     alert->Go();
                 }
             }
@@ -408 +412 @@
                         "You can't turn it off!"),
                         B_TRANSLATE("That's no Fun!"), NULL, NULL,
                         B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-                    alert->SetShortcut(0, B_ESCAPE);
+                    alert->SetFlags(B_CLOSE_ON_ESCAPE);
                     alert->Go();
                 } else
                     _kern_set_cpu_enabled(cpu, !_kern_cpu_enabled(cpu));
@@ -893 +897 @@
                         alert = new BAlert("", "The semaphore wasn't released, "
                             "because it wasn't necessary anymore!",
                             "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+                        alert->SetFlags(B_CLOSE_ON_ESCAPE);
                         alert->Go();
                     }
                 }

src/apps/pulse/CPUButton.cpp

@@ -243 +243 @@
         BAlert *alert = new BAlert(B_TRANSLATE("Info"),
             B_TRANSLATE("You can't disable the last active CPU."),
             B_TRANSLATE("OK"));
-        alert->SetShortcut(0, B_ESCAPE);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go(NULL);
         SetValue(!Value());
     }

src/apps/pulse/DeskbarPulseView.cpp

@@ -182 +182 @@
         str.UnlockBuffer();
         BAlert *alert = new BAlert(B_TRANSLATE("Info"), str.String(),
             B_TRANSLATE("OK"));
-        alert->SetShortcut(0, B_ESCAPE);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go(NULL);
     }
     delete deskbar;

src/apps/pulse/PulseApp.cpp

@@ -193 +193 @@
     font.SetSize(18);
     font.SetFace(B_BOLD_FACE);
     view->SetFontAndColor(0, name.Length(), &font);
-    alert->SetShortcut(0, B_ESCAPE);
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     // Use the asynchronous version so we don't block the window's thread
     alert->Go(NULL);
 }
@@ -278 +278 @@
         message.UnlockBuffer();
         BAlert *alert = new BAlert(B_TRANSLATE("Error"),
             message.String(), B_TRANSLATE("OK"));
-        alert->SetShortcut(0, B_ESCAPE);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go(NULL);
         return false;
     }

src/apps/pulse/PulseView.cpp

@@ -130 +130 @@
         BAlert *alert = new BAlert(B_TRANSLATE("Info"),
             B_TRANSLATE("You can't disable the last active CPU."),
             B_TRANSLATE("OK"));
-        alert->SetShortcut(0, B_ESCAPE);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go(NULL);
     }
 }

src/apps/resedit/BitmapView.cpp

@@ -250 +250 @@
     switch (msg->what)
     {
         case M_REMOVE_IMAGE: {
-            BAlert *alert = new BAlert("Mr. Peeps!", "This cannot be undone. Remove the image?",
-                                        "Remove", "Cancel");
+            BAlert *alert = new BAlert("Mr. Peeps!", "This cannot be undone. "
+                "Remove the image?", "Remove", "Cancel");
+            alert->SetShortcut(1, B_ESCAPE);
             int32 value = alert->Go();
             if (value == 0) {
                 SetBitmap(NULL);

src/apps/resedit/ResWindow.cpp

@@ -34 +34 @@
 ResWindow::QuitRequested(void)
 {
     if (fView->GetSaveStatus() == FILE_DIRTY) {
-        BAlert *alert = new BAlert("ResEdit","Save your changes?","Cancel","Don't Save","Save");
+        BAlert *alert = new BAlert("ResEdit", "Save your changes?", "Cancel",
+            "Don't Save", "Save");
+        alert->SetShortcut(0, B_ESCAPE);
+        
         switch (alert->Go()) {
             case 0:
                 return false;

src/apps/screenshot/ScreenshotWindow.cpp

@@ -669 +669 @@
         &rect);
     if (err < B_OK || view == NULL) {
         BAlert *alert = new BAlert(NULL, strerror(err), "OK");
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
     } else {
         if (fSettingsWindow) {

src/apps/showimage/ShowImageView.cpp

@@ -953 +953 @@
         snprintf(buffer, sizeof(buffer), B_TRANSLATE("The file '%s' could not "
             "be written."), name);
         BAlert* palert = new BAlert("", buffer, B_TRANSLATE("OK"));
+        palert->SetFlags(B_CLOSE_ON_ESCAPE);
         palert->Go();
     }
 

src/apps/showimage/ShowImageWindow.cpp

@@ -1108 +1108 @@
             "LoadAlerts"),
         B_TRANSLATE_CONTEXT("OK", "Alerts"), NULL, NULL,
         B_WIDTH_AS_USUAL, B_INFO_ALERT);
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
 }
 
@@ -1216 +1217 @@
 
     BAlert* alert = new BAlert(B_TRANSLATE("Close document"), prompt.String(),
         B_TRANSLATE("Cancel"), B_TRANSLATE("Close"));
+    alert->SetShortcut(0, B_ESCAPE);
+    
     if (alert->Go() == 0) {
         // Cancel
         return false;

src/apps/soundrecorder/RecorderWindow.cpp

@@ -1175 +1175 @@
         sprintf(msg, "%s: %s. [%lx]", action, strerror(err), (int32) err);
     else
         sprintf(msg, "%s.", action);
-    (new BAlert("", msg, B_TRANSLATE("Stop")))->Go();
+    BAlert* alert = new BAlert("", msg, B_TRANSLATE("Stop"));
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
+    alert->Go();
 }
 
 
@@ -1334 +1336 @@
     }
 
     if (countBad > 0 && countGood == 0) {
-        (new BAlert(B_TRANSLATE("Nothing to play"), B_TRANSLATE("None of the "
-            "files appear to be audio files"), B_TRANSLATE("OK"), NULL, NULL,
-            B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
+        BAlert* alert = new BAlert(B_TRANSLATE("Nothing to play"),
+            B_TRANSLATE("None of the files appear to be audio files"),
+            B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
     } else if (countGood > 0) {
-        if (countBad > 0)
-            (new BAlert(B_TRANSLATE("Invalid audio files"), B_TRANSLATE("Some "
-                "of the files don't appear to be audio files"),
+        if (countBad > 0) {
+            BAlert* alert = new BAlert(B_TRANSLATE("Invalid audio files"),
+            B_TRANSLATE("Some of the files don't appear to be audio files"),
                 B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL,
-                B_WARNING_ALERT))->Go();
+                B_WARNING_ALERT);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
+        }
         fSoundList->Select(fSoundList->CountItems() - 1);
     }
 }

src/apps/stylededit/StyledEditWindow.cpp

@@ -1640 +1640 @@
 
     BAlert* alert = new BAlert("Statistics", result, B_TRANSLATE("OK"), NULL,
         NULL, B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_INFO_ALERT);
-
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
+    
     return alert->Go();
 }
 

src/apps/sudoku/SudokuWindow.cpp

@@ -411 +411 @@
                 strerror(status));
         }
 
-        (new BAlert(B_TRANSLATE("Sudoku request"),
+        BAlert* alert = new BAlert(B_TRANSLATE("Sudoku request"),
             buffer, B_TRANSLATE("OK"), NULL, NULL,
-            B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
+            B_WIDTH_AS_USUAL, B_STOP_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
     }
 }
 
@@ -554 +556 @@
         }
 
         case kMsgSudokuSolved:
-            (new BAlert(B_TRANSLATE("Sudoku request"),
+        {
+            BAlert* alert = new BAlert(B_TRANSLATE("Sudoku request"),
                 B_TRANSLATE("Sudoku solved - congratulations!\n"),
                 B_TRANSLATE("OK"), NULL, NULL,
-                B_WIDTH_AS_USUAL, B_IDEA_ALERT))->Go();
+                B_WIDTH_AS_USUAL, B_IDEA_ALERT);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
             break;
+        }
 
         case B_OBSERVER_NOTICE_CHANGE:
         {

src/apps/terminal/TermApp.cpp

@@ -104 +104 @@
             B_TRANSLATE("Terminal couldn't start the shell. Sorry."),
             B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_FROM_LABEL,
             B_INFO_ALERT);
-        alert->SetShortcut(0, B_ESCAPE);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go(NULL);
         PostMessage(B_QUIT_REQUESTED);
         return;

src/apps/terminal/TermWindow.cpp

@@ -711 +711 @@
                 BAlert* alert = new BAlert(B_TRANSLATE("Find failed"),
                     errorMsg, B_TRANSLATE("OK"), NULL, NULL,
                     B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-                alert->SetShortcut(0, B_ESCAPE);
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
 
                 alert->Go();
                 fFindPreviousMenuItem->SetEnabled(false);
@@ -729 +729 @@
                     B_TRANSLATE("Text not found."),
                     B_TRANSLATE("OK"), NULL, NULL,
                     B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-                alert->SetShortcut(0, B_ESCAPE);
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
                 alert->Go();
                 fFindPreviousMenuItem->SetEnabled(false);
                 fFindNextMenuItem->SetEnabled(false);
@@ -751 +751 @@
                 BAlert* alert = new BAlert(B_TRANSLATE("Find failed"),
                     B_TRANSLATE("Not found."), B_TRANSLATE("OK"),
                     NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-                alert->SetShortcut(0, B_ESCAPE);
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
                 alert->Go();
             }
             break;

src/apps/text_search/GrepWindow.cpp

@@ -1290 +1290 @@
         text << "\n";
         BAlert* alert = new BAlert(NULL, text.String(), B_TRANSLATE("OK"), NULL, NULL,
             B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go(NULL);
         return;
     }
@@ -1382 +1383 @@
             B_TRANSLATE("Please select the files you wish to have selected for you in "
                 "Tracker."),
             B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go(NULL);
         return;
     }
@@ -1446 +1448 @@
         str1.ReplaceFirst("%APP_NAME",APP_NAME);
         BAlert* alert = new BAlert(NULL, str1.String(), B_TRANSLATE("OK"), 
             NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go(NULL);
         goto out;
     }

src/apps/tv/MainWin.cpp

@@ -375 +375 @@
         BString s;
         s << B_TRANSLATE("Error, interface is busy:\n\n");
         s << gDeviceRoster->DeviceName(i);
-        (new BAlert("error", s.String(), B_TRANSLATE("OK")))->Go();
+        BAlert* alert = new BAlert("error", s.String(), B_TRANSLATE("OK"));
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
         return;
     }
 
@@ -384 +386 @@
         BString s;
         s << B_TRANSLATE("Error, connecting to interface failed:\n\n");
         s << gDeviceRoster->DeviceName(i);
-        (new BAlert("error", s.String(), B_TRANSLATE("OK")))->Go();
+        BAlert* alert = new BAlert("error", s.String(), B_TRANSLATE("OK"));
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
     }
 
 done:

src/apps/webpositive/BrowserApp.cpp

@@ -103 +103 @@
 
     BAlert* alert = new BAlert("About WebPositive", aboutText.String(),
         "Sweet!");
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go(NULL);
 }
 

src/apps/webpositive/BrowserWindow.cpp

@@ -680 +680 @@
                 B_TRANSLATE("Do you really want to "
                 "clear the browsing history?"), B_TRANSLATE("Clear"),
                 B_TRANSLATE("Cancel"));
+            alert->SetShortcut(1, B_ESCAPE);
+
             if (alert->Go() == 0)
                 history->Clear();
             break;
@@ -732 +734 @@
 
                 BAlert* alert = new BAlert(B_TRANSLATE("Open bookmarks confirmation"),
                     string.String(), B_TRANSLATE("Cancel"), B_TRANSLATE("Open all"));
+                alert->SetShortcut(0, B_ESCAPE);
                 if (alert->Go() == 0)
                     break;
             }
@@ -1586 +1589 @@
         BAlert* alert = new BAlert(B_TRANSLATE("Bookmark error"),
             message.String(), B_TRANSLATE("OK"), NULL, NULL,
             B_WIDTH_AS_USUAL, B_STOP_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         return;
     }
@@ -1615 +1619 @@
         message.ReplaceFirst("%bookmarkName", bookmarkName);
         BAlert* alert = new BAlert(B_TRANSLATE("Bookmark info"),
             message.String(), B_TRANSLATE("OK"));
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         return;
     }
@@ -1709 +1714 @@
         BAlert* alert = new BAlert(B_TRANSLATE("Bookmark error"),
             message.String(), B_TRANSLATE("OK"), NULL, NULL,
             B_WIDTH_AS_USUAL, B_STOP_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         return;
     }
@@ -1734 +1740 @@
         BAlert* alert = new BAlert(B_TRANSLATE("Bookmark error"),
             message.String(), B_TRANSLATE("OK"), NULL, NULL,
             B_WIDTH_AS_USUAL, B_STOP_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         return;
     }
@@ -2226 +2233 @@
             "page source: %s\n", strerror(ret));
         BAlert* alert = new BAlert(B_TRANSLATE("Page source error"), buffer,
             B_TRANSLATE("OK"));
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go(NULL);
     }
 }

src/apps/webpositive/DownloadProgressView.cpp

@@ -412 +412 @@
                 BAlert* alert = new BAlert(B_TRANSLATE("Open download error"),
                     B_TRANSLATE("The download could not be opened."),
                     B_TRANSLATE("OK"));
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
                 alert->Go(NULL);
             }
             break;

src/apps/webpositive/DownloadWindow.cpp

@@ -286 +286 @@
                 errorString.ReplaceFirst("%error", strerror(status));
                 BAlert* alert = new BAlert(B_TRANSLATE("Error opening downloads "
                     "folder"), errorString.String(), B_TRANSLATE("OK"));
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
                 alert->Go(NULL);
             }
             break;

src/apps/webwatch/WatchView.cpp

@@ -159 +159 @@
         "mahlzeit@users.sourceforge.net\n\n"
         "Thanks to Jason Parks for his help.\n");
     text.ReplaceFirst("%1", VERSION);
-    (new BAlert(NULL, text.String(), B_TRANSLATE("OK")))->Go(NULL);
+    BAlert* alert = new BAlert(NULL, text.String(), B_TRANSLATE("OK"));
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
+    alert->Go(NULL);
 }
 
 ///////////////////////////////////////////////////////////////////////////////

src/apps/workspaces/Workspaces.cpp

@@ -420 +420 @@
     font.SetFace(B_BOLD_FACE);
     view->SetFontAndColor(0, 10, &font);
 
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
 }
 

src/bin/checkitout.cpp

@@ -57 +57 @@
     message << "Proceed anyway?";
     BAlert* alert = new BAlert("Warning", message.String(), "Proceed", "Stop", NULL,
         B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+    alert->SetShortcut(1, B_ESCAPE);
     int32 button;
     button = alert->Go();
     if (button == 0)

src/bin/desklink/MediaReplicant.cpp

@@ -390 +390 @@
         BString message = B_TRANSLATE("Couldn't launch ");
         message << prettyName;
 
-        (new BAlert(B_TRANSLATE("desklink"), message.String(),
-            B_TRANSLATE("OK")))->Go();
+        BAlert* alert = new BAlert(B_TRANSLATE("desklink"), message.String(),
+            B_TRANSLATE("OK"));
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
     }
 }
 

src/bin/mail_utils/spamdbm.cpp

@@ -1503 +1503 @@
   {
     AlertPntr = new BAlert (TitleString, MessageString,
       "Acknowledge", NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
-    if (AlertPntr != NULL)
+    if (AlertPntr != NULL) {
+      AlertPntr->SetFlags(B_CLOSE_ON_ESCAPE);
       AlertPntr->Go ();
+    }
   }
 }
 
@@ -1839 +1841 @@
         g_MaxInterestingWords - j);
 
     AlertPntr = new BAlert ("Estimate", TempString, "OK");
-    if (AlertPntr != NULL)
+    if (AlertPntr != NULL) {
+      AlertPntr->SetFlags(B_CLOSE_ON_ESCAPE);
       AlertPntr->Go ();
+    }
   }
 }
 
@@ -2533 +2537 @@
 "Compiled on " __DATE__ " at " __TIME__ ".", "Done");
   if (AboutAlertPntr != NULL)
   {
-    AboutAlertPntr->SetShortcut (0, B_ESCAPE);
+    AboutAlertPntr->SetFlags(B_CLOSE_ON_ESCAPE);
     AboutAlertPntr->Go ();
   }
 }

src/bin/screenmode/screenmode.cpp

@@ -335 +335 @@
         BAlert* alert = new BAlert("screenmode",
             "You have used the shortcut <Command><Ctrl><Escape> to reset the "
             "screen mode to a safe fallback.", "Keep", "Revert");
+        alert->SetShortcut(1, B_ESCAPE);
         if (alert->Go() == 1)
             screenMode.Revert();
     }

src/bin/urlwrapper.cpp

@@ -58 +58 @@
     message << "Proceed anyway?";
     BAlert* alert = new BAlert("Warning", message.String(), "Proceed", "Stop", NULL,
         B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+    alert->SetShortcut(1, B_ESCAPE);
     int32 button;
     button = alert->Go();
     if (button == 0)

src/kits/app/Application.cpp

@@ -649 +649 @@
     thread_info info;
     if (get_thread_info(Thread(), &info) == B_OK) {
         BAlert *alert = new BAlert("_about_", info.name, "OK");
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go(NULL);
     }
 }

src/kits/interface/Dragger.cpp

@@ -303 +303 @@
             if (fShelf != NULL)
                 Window()->PostMessage(kDeleteReplicant, fTarget, NULL);
             else {
-                (new BAlert(B_TRANSLATE("Warning"),
+                BAlert* alert = new BAlert(B_TRANSLATE("Warning"),
                     B_TRANSLATE("Can't delete this replicant from its original "
                     "application. Life goes on."),
                     B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_FROM_WIDEST,
-                    B_WARNING_ALERT))->Go(NULL);
+                    B_WARNING_ALERT);
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
+                alert->Go(NULL);
             }
             break;
 

src/kits/interface/PrintJob.cpp

@@ -103 +103 @@
 ShowError(const char* message)
 {
     BAlert* alert = new BAlert(B_TRANSLATE("Error"), message, B_TRANSLATE("OK"));
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
 }
 
@@ -748 +749 @@
     fHiddenApplicationModalWindow = new BAlert("bogus", "app_modal", "OK");
     fHiddenApplicationModalWindow->DefaultButton()->SetEnabled(false);
     fHiddenApplicationModalWindow->SetDefaultButton(NULL);
+    fHiddenApplicationModalWindow->SetFlags(B_CLOSE_ON_ESCAPE);
     fHiddenApplicationModalWindow->MoveTo(-65000, -65000);
     fHiddenApplicationModalWindow->Go(NULL);
 }

src/kits/interface/ZombieReplicantView.cpp

@@ -70 +70 @@
             BAlert* alert = new (std::nothrow) BAlert(B_TRANSLATE("Error"),
                 error.String(), B_TRANSLATE("OK"), NULL, NULL,
                 B_WIDTH_AS_USUAL, B_STOP_ALERT);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             if (alert != NULL)
                 alert->Go();
 

src/kits/shared/AboutWindow.cpp

@@ -88 +88 @@
     font.SetFace(B_BOLD_FACE);
     font.SetSize(font.Size() * 1.7);
     view->SetFontAndColor(0, fAppName->Length(), &font);
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
 }
 

src/kits/tracker/AutoMounterSettings.cpp

@@ -335 +335 @@
     BMessage reply;
     status_t ret = target.SendMessage(&message, &reply, 2500000);
     if (ret != B_OK) {
-        (new BAlert(B_TRANSLATE("Mount server error"),
+        BAlert* alert = new BAlert(B_TRANSLATE("Mount server error"),
             B_TRANSLATE("The mount server could not be contacted."),
             B_TRANSLATE("OK"),
-            NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
+            NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
         return;
     }
 

src/kits/tracker/ContainerWindow.cpp

@@ -286 +286 @@
 
     BAlert* alert = new BAlert("", buffer.String(), B_TRANSLATE("Cancel"),
         0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-    alert->SetShortcut(0, B_ESCAPE);
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
 
     return result;
@@ -3213 +3213 @@
 
         BAlert* alert = new BAlert("", buffer.String(), B_TRANSLATE("Cancel"),
             0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-        alert->SetShortcut(0, B_ESCAPE);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         return;
     }

src/kits/tracker/FSClipboard.cpp

@@ -479 +479 @@
             B_TRANSLATE("You must drop items on one of the disk icons "
             "in the \"Disks\" window."), B_TRANSLATE("Cancel"), NULL, NULL,
             B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-        alert->SetShortcut(0, B_ESCAPE);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         okToMove = false;
     }
@@ -493 +493 @@
             B_TRANSLATE("Sorry, you can't copy items to the Trash."),
             B_TRANSLATE("Cancel"), NULL, NULL, B_WIDTH_AS_USUAL,
             B_WARNING_ALERT);
-        alert->SetShortcut(0, B_ESCAPE);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         okToMove = false;
     }

src/kits/tracker/FSUtils.cpp

@@ -357 +357 @@
 
     BAlert* alert = new BAlert("", buffer.String(), B_TRANSLATE("Cancel"), 0, 0,
         B_WIDTH_AS_USUAL, B_STOP_ALERT);
-    alert->SetShortcut(0, B_ESCAPE);
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
     return false;
 }
@@ -736 +736 @@
         BAlert* alert = new BAlert("",
             B_TRANSLATE("You can't move or copy items to read-only volumes."),
             B_TRANSLATE("Cancel"), 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-        alert->SetShortcut(0, B_ESCAPE);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         return B_ERROR;
     }
@@ -762 +762 @@
             BAlert* alert = new BAlert("", errorStr.String(),
                 B_TRANSLATE("Cancel"), 0, 0, B_WIDTH_AS_USUAL,
                 B_WARNING_ALERT);
-            alert->SetShortcut(0, B_ESCAPE);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             alert->Go();
             return B_ERROR;
         }
@@ -820 +820 @@
                             B_TRANSLATE_NOCOLLECT(kNoFreeSpace),
                             B_TRANSLATE("Cancel"),
                             0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-                        alert->SetShortcut(0, B_ESCAPE);
+                        alert->SetFlags(B_CLOSE_ON_ESCAPE);
                         alert->Go();
                         return B_ERROR;
                     }
@@ -993 +993 @@
                 BAlert* alert = new BAlert("", error.String(),
                     B_TRANSLATE("Cancel"), 0, 0, B_WIDTH_AS_USUAL,
                     B_WARNING_ALERT);
-                alert->SetShortcut(0, B_ESCAPE);
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
                 alert->Go();
                 break;
             }
@@ -1012 +1012 @@
                     BAlert* alert = new BAlert("", error.String(),
                         B_TRANSLATE("Cancel"), 0, 0, B_WIDTH_AS_USUAL,
                         B_WARNING_ALERT);
-                    alert->SetShortcut(0, B_ESCAPE);
+                    alert->SetFlags(B_CLOSE_ON_ESCAPE);
                     alert->Go();
                     break;
                 }
@@ -1742 +1742 @@
     } catch (MoveError error) {
         BString errorString(B_TRANSLATE("Error moving \"%name\""));
         errorString.ReplaceFirst("%name", ref.name);
-        (new BAlert("", errorString.String(), B_TRANSLATE("OK"), 0, 0,
-            B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+        BAlert* alert = new BAlert("", errorString.String(), B_TRANSLATE("OK"),
+            0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
         return error.fError;
     } catch (FailWithAlert error) {
         BString buffer(error.fString);
@@ -1751 +1753 @@
             buffer.ReplaceFirst("%name", error.fName);
         else
             buffer <<  error.fString;
-        (new BAlert("", buffer.String(), B_TRANSLATE("OK"), 0, 0,
-            B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+        BAlert* alert = new BAlert("", buffer.String(), B_TRANSLATE("OK"),
+            0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
 
         return error.fError;
     }
@@ -1890 +1894 @@
                 BAlert* alert = new BAlert("", buffer.String(),
                     B_TRANSLATE("Cancel"), 0, 0, B_WIDTH_AS_USUAL,
                     B_WARNING_ALERT);
-                alert->SetShortcut(0, B_ESCAPE);
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
                 alert->Go();
             } else {
                 BMessage message(kUnmountVolume);
@@ -1910 +1914 @@
         trash_dir.GetEntry(&trashEntry);
 
         if (dir == trash_dir || dir.Contains(&trashEntry)) {
-            (new BAlert("",
+            BAlert* alert = new BAlert("",
                 B_TRANSLATE("You cannot put the Trash, home or Desktop "
                     "directory into the trash."),
                 B_TRANSLATE("OK"),
-                0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+                0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
 
             // return no error so we don't get two dialogs
             return B_OK;
@@ -2062 +2068 @@
             && moveMode != kCreateRelativeLink
             && (srcDirectory == *destDir
                 || srcDirectory.Contains(&destEntry))) {
-            (new BAlert("",
+            BAlert* alert = new BAlert("",
                 B_TRANSLATE("You can't move a folder into itself "
                 "or any of its own sub-folders."), B_TRANSLATE("OK"),
-                0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+                0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
             return B_ERROR;
         }
     }
 
     if (FSIsTrashDir(sourceEntry) && moveMode != kCreateLink
         && moveMode != kCreateRelativeLink) {
-        (new BAlert("",
+        BAlert* alert = new BAlert("",
             B_TRANSLATE("You can't move or copy the trash."),
             B_TRANSLATE("OK"), 0, 0, B_WIDTH_AS_USUAL,
-                B_WARNING_ALERT))->Go();
+            B_WARNING_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
         return B_ERROR;
     }
 
@@ -2098 +2108 @@
     if (destIsDir) {
         BDirectory test_dir(&entry);
         if (test_dir.Contains(sourceEntry)) {
-            (new BAlert("",
+            BAlert* alert = new BAlert("",
                 B_TRANSLATE("You can't replace a folder "
                 "with one of its sub-folders."),
-                B_TRANSLATE("OK"),
-                0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+                B_TRANSLATE("OK"), 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
             return B_ERROR;
         }
     }
@@ -2112 +2123 @@
     if (moveMode != kCreateLink
         && moveMode != kCreateRelativeLink
         && destIsDir != sourceIsDirectory) {
-            (new BAlert("", sourceIsDirectory
+            BAlert* alert = new BAlert("", sourceIsDirectory
                 ? B_TRANSLATE("You cannot replace a file with a folder or a "
                 "symbolic link.")
                 : B_TRANSLATE("You cannot replace a folder or a symbolic link "
                 "with a file."), B_TRANSLATE("OK"), 0, 0, B_WIDTH_AS_USUAL,
-                B_WARNING_ALERT))->Go();
+                B_WARNING_ALERT);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
             return B_ERROR;
         }
 
@@ -2196 +2209 @@
         error.ReplaceFirst("%name", name);;
         BAlert* alert = new BAlert("", error.String(),
             B_TRANSLATE("Cancel"), 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-        alert->SetShortcut(0, B_ESCAPE);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
     }
 
@@ -2815 +2828 @@
     }
 
     if (err != B_OK && err != kTrashCanceled && err != kUserCanceled) {
-        (new BAlert("", B_TRANSLATE("Error emptying Trash"),
-            B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL,
-            B_WARNING_ALERT))->Go();
+        BAlert* alert = new BAlert("", B_TRANSLATE("Error emptying Trash"),
+            B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
     }
 
     return B_OK;
@@ -2887 +2901 @@
                 err = entry.Remove();
         }
 
-        if (err != kTrashCanceled && err != kUserCanceled && err != B_OK)
-            (new BAlert("", B_TRANSLATE("Error deleting items"),
-                B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL,
-                B_WARNING_ALERT))->Go();
+        if (err != kTrashCanceled && err != kUserCanceled && err != B_OK) {
+            BAlert* alert = new BAlert("", B_TRANSLATE("Error deleting items"),
+                B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
+        }
     }
 
     delete list;
@@ -3081 +3097 @@
     BAlert* alert = new BAlert("",
         B_TRANSLATE("Sorry, could not create a new folder."),
         B_TRANSLATE("Cancel"), 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-    alert->SetShortcut(0, B_ESCAPE);
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
     return result;
 }
@@ -3254 +3270 @@
             BAlert* alert = new BAlert("", alertString.String(),
                 B_TRANSLATE("Cancel"), 0, 0, B_WIDTH_AS_USUAL,
                 B_WARNING_ALERT);
-            alert->SetShortcut(0, B_ESCAPE);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             alert->Go();
         }
     }
@@ -3557 +3573 @@
             BAlert* alert = new BAlert("", alertString.String(),
                 B_TRANSLATE("Cancel"), 0, 0, B_WIDTH_AS_USUAL,
                 B_WARNING_ALERT);
-            alert->SetShortcut(0, B_ESCAPE);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             alert->Go();
         }
     }

src/kits/tracker/InfoWindow.cpp

@@ -1985 +1985 @@
         if (entry.InitCheck() == B_OK
             && entry.GetParent(&parent) == B_OK) {
             if (parent.Contains(text)) {
-                (new BAlert("",
+                BAlert* alert = new BAlert("",
                     B_TRANSLATE("That name is already taken. "
                     "Please type another one."),
                     B_TRANSLATE("OK"),
-                    0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+                    0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
+                alert->Go();
                 reopen = true;
             } else {
                 if (fModel->IsVolume()) {
@@ -2009 +2011 @@
             }
         }
     } else if (length >= B_FILE_NAME_LENGTH) {
-        (new BAlert("",
-            B_TRANSLATE("That name is too long. "
-            "Please type another one."),
+        BAlert* alert = new BAlert("",
+            B_TRANSLATE("That name is too long. Please type another one."),
             B_TRANSLATE("OK"),
-            0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+            0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
         reopen = true;
     }
 

src/kits/tracker/OpenWithWindow.cpp

@@ -672 +672 @@
             B_TRANSLATE("Could not find application \"%appname\""));
         errorString.ReplaceFirst("%appname", pose->TargetModel()->Name());
 
-        (new BAlert("", errorString.String(), B_TRANSLATE("OK"), 0, 0,
-            B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+        BAlert* alert = new BAlert("", errorString.String(), B_TRANSLATE("OK"),
+            0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
         return;
     }
 

src/kits/tracker/PoseView.cpp

@@ -2609 +2609 @@
             BAlert* alert = new BAlert("",
                 B_TRANSLATE("You must have at least one attribute showing."),
                 B_TRANSLATE("Cancel"), 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-            alert->SetShortcut(0, B_ESCAPE);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             alert->Go();
         }
 
@@ -4832 +4832 @@
             B_TRANSLATE("You must drop items on one of the disk icons "
             "in the \"Disks\" window."), B_TRANSLATE("Cancel"), NULL, NULL,
             B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-        alert->SetShortcut(0, B_ESCAPE);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         okToMove = false;
     }
@@ -4843 +4843 @@
             B_TRANSLATE("Sorry, you can't copy items to the Trash."),
             B_TRANSLATE("Cancel"), NULL, NULL, B_WIDTH_AS_USUAL,
             B_WARNING_ALERT);
-        alert->SetShortcut(0, B_ESCAPE);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         okToMove = false;
     }
@@ -4854 +4854 @@
             B_TRANSLATE("Sorry, you can't create links in the Trash."),
             B_TRANSLATE("Cancel"), NULL, NULL, B_WIDTH_AS_USUAL,
             B_WARNING_ALERT);
-        alert->SetShortcut(0, B_ESCAPE);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         okToMove = false;
     }
@@ -5744 +5744 @@
             B_TRANSLATE("Files cannot be moved or deleted from a read-only "
             "volume."), B_TRANSLATE("Cancel"), NULL, NULL, B_WIDTH_AS_USUAL,
             B_STOP_ALERT);
-        alert->SetShortcut(0, B_ESCAPE);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         return false;
     }
@@ -6084 +6084 @@
             BString message(
                 B_TRANSLATE("Error in regular expression:\n\n'%errstring'"));
             message.ReplaceFirst("%errstring", regExpression.ErrorString());
-            (new BAlert("", message.String(), B_TRANSLATE("OK"), NULL, NULL,
-                B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
+            BAlert* alert = new BAlert("", message.String(), B_TRANSLATE("OK"),
+                NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
             return 0;
         }
     }
@@ -8076 +8078 @@
             B_TRANSLATE("The Tracker must be running to see Info windows."),
             B_TRANSLATE("Cancel"), NULL, NULL, B_WIDTH_AS_USUAL,
             B_WARNING_ALERT);
-        alert->SetShortcut(0, B_ESCAPE);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         return;
     }
@@ -8093 +8095 @@
             B_TRANSLATE("The Tracker must be running to see set the default "
             "printer."), B_TRANSLATE("Cancel"), NULL, NULL, B_WIDTH_AS_USUAL,
             B_WARNING_ALERT);
-        alert->SetShortcut(0, B_ESCAPE);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         return;
     }

src/kits/tracker/Tracker.cpp

@@ -704 +704 @@
                 B_TRANSLATE("There was an error resolving the link."),
                 B_TRANSLATE("Cancel"), 0, 0, B_WIDTH_AS_USUAL,
                     B_WARNING_ALERT);
-            alert->SetShortcut(0, B_ESCAPE);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             alert->Go();
             return result;
         }

src/kits/tracker/TrackerInitialState.cpp

@@ -641 +641 @@
             "failed. \nReason: %error"));
         errorMessage.ReplaceFirst("%func", __PRETTY_FUNCTION__);
         errorMessage.ReplaceFirst("%error", strerror(status));
-        (new BAlert("AlertError", errorMessage.String(), B_TRANSLATE("OK"),
-            NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
+        BAlert* alert = new BAlert("AlertError", errorMessage.String(),
+            B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
         return;
     }
     path.Append("artwork");

src/kits/tracker/WidgetAttributeText.cpp

@@ -1661 +1661 @@
             B_TRANSLATE("Sorry, you cannot edit that attribute."),
             B_TRANSLATE("Cancel"),
             0, 0, B_WIDTH_AS_USUAL, B_STOP_ALERT);
-        alert->SetShortcut(0, B_ESCAPE);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
         return false;
     }
@@ -1698 +1698 @@
                     "attribute cannot store a multi-byte glyph."),
                     B_TRANSLATE("Cancel"),
                     0, 0, B_WIDTH_AS_USUAL, B_STOP_ALERT);
-                alert->SetShortcut(0, B_ESCAPE);
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
                 alert->Go();
                 return false;
             }
@@ -1806 +1806 @@
             B_TRANSLATE("There was an error writing the attribute."),
             B_TRANSLATE("Cancel"),
             0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-        alert->SetShortcut(0, B_ESCAPE);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
 
         fValueIsDefined = false;

src/libs/print/libprint/BlockingWindow.cpp

@@ -131 +131 @@
         font.SetSize(12); // font.SetFace(B_OUTLINED_FACE);
         v->SetFontAndColor(0, s-text+1, &font, B_FONT_SIZE);
     };
+    about->SetFlags(B_CLOSE_ON_ESCAPE);
     about->Go();
 }
 

src/libs/print/libprint/GraphicsDriver.cpp

@@ -702 +702 @@
             alert = new BAlert("", fTransport->LastError().c_str(), "OK");
         else
             alert = new BAlert("", "Printer not responding.", "OK");
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
     }
 

src/preferences/appearance/CurView.cpp

@@ -238 +238 @@
                     "Please contact OpenBeOS about Appearance Preferences::CurView::"
                     "LoadCursorSets::B_NAME_TOO_LONG for a bugfix", "OK",
                      NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+                a->SetFlags(B_CLOSE_ON_ESCAPE);
                 a->Go();
                 break;
             }
@@ -267 +268 @@
                     "because of a file error. Perhaps there is a file (instead of a folder) at " COLOR_SET_DIR
                     "? You will be able to change system cursors, but be unable to save them to a cursor set. ",
                     "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+                a->SetFlags(B_CLOSE_ON_ESCAPE);
                 a->Go();
                 break;
             }
@@ -276 +278 @@
                     "because there are too many open files. Please close some files and restart "
                     " this application.", "OK",
                      NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+                a->SetFlags(B_CLOSE_ON_ESCAPE);
                 a->Go();
                 if(Window())
                     Window()->PostMessage(B_QUIT_REQUESTED);

src/preferences/appearance/DecorSettingsView.cpp

@@ -120 +120 @@
 
             BAlert *infoAlert = new BAlert(B_TRANSLATE("About Decorator"),
                 infoText.String(), B_TRANSLATE("OK"));
-            infoAlert->SetShortcut(0, B_ESCAPE); 
+            infoAlert->SetFlags(B_CLOSE_ON_ESCAPE);
             infoAlert->Go(); 
 
             break;

src/preferences/bluetooth/BluetoothMain.cpp

@@ -27 +27 @@
 BluetoothApplication::ReadyToRun()
 {
     if (!be_roster->IsRunning(BLUETOOTH_SIGNATURE)) {
-
-        int32 choice = (new BAlert("bluetooth_server not running",
+        BAlert* alert = new BAlert("bluetooth_server not running",
             B_TRANSLATE("bluetooth_server has not been found running on the "
             "system. Should be started, or stay offline"),
             B_TRANSLATE("Work offline"), B_TRANSLATE("Quit"),
             B_TRANSLATE("Start please"), B_WIDTH_AS_USUAL,
-            B_WARNING_ALERT))->Go();
+            B_WARNING_ALERT);
+        alert->SetShortcut(2, B_ESCAPE);
+        int32 choice = alert->Go();
 
 
         switch (choice) {
@@ -90 +91 @@
 void
 BluetoothApplication::AboutRequested()
 {
-
-    (new BAlert("about", B_TRANSLATE("Haiku Bluetooth system, (ARCE)\n\n"
+    BAlert* alert = new BAlert("about", B_TRANSLATE(
+                            "Haiku Bluetooth system, (ARCE)\n\n"
                             "Created by Oliver Ruiz Dorantes\n\n"
                             "With support of:\n"
                             "   - Mika Lindqvist\n"
@@ -121 +122 @@
                             "   - Petter H. Juliussen\n"
                             "Who gave me all the knowledge:\n"
                             "   - the yellowTAB team"),
-                        B_TRANSLATE("OK")))->Go();
-
+                        B_TRANSLATE("OK"));
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
+    alert->Go();
 }
 
 

src/preferences/cpufrequency/StatusView.cpp

@@ -429 +429 @@
     BAlert *alert = new BAlert("about", B_TRANSLATE("CPUFrequency\n"
             "\twritten by Clemens Zeidler\n"
             "\tCopyright 2009, Haiku, Inc.\n"),
-        B_TRANSLATE("Ok"));
+        B_TRANSLATE("OK"));
     BTextView *view = alert->TextView();
     BFont font;
 
@@ -440 +440 @@
     font.SetFace(B_BOLD_FACE);
     view->SetFontAndColor(0, 13, &font);
 
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
 }
 
@@ -689 +690 @@
             "Launching the CPU frequency preflet failed.\n\nError: "));
         errorMessage << strerror(ret);
         BAlert* alert = new BAlert("launch error", errorMessage.String(),
-            "Ok");
+            "OK");
         // asynchronous alert in order to not block replicant host
         // application
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go(NULL);
     }
 }

src/preferences/datatranslations/DataTranslations.cpp

@@ -53 +53 @@
     text.UnlockBuffer();
     BAlert* alert = new BAlert(B_TRANSLATE("DataTranslations - Error"),
         text.String(), B_TRANSLATE("OK"));
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
 }
 
@@ -83 +84 @@
         B_TRANSLATE("The item '%name' does not appear to be a Translator and "
         "will not be installed."));
     text.ReplaceAll("%name", name);
-    BAlert* alert = new BAlert("", text.String(), B_TRANSLATE("Ok"));
+    BAlert* alert = new BAlert("", text.String(), B_TRANSLATE("OK"));
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
 }
 
@@ -152 +154 @@
             BAlert* alert = new BAlert(B_TRANSLATE("DataTranslations - Note"),
                 B_TRANSLATE("The new translator has been installed "
                     "successfully."), B_TRANSLATE("OK"));
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             alert->Go(NULL);
         } else
             _InstallError(ref.name, status);

src/preferences/datatranslations/DataTranslationsWindow.cpp

@@ -282 +282 @@
         view->SetFontAndColor(index, index + strlen(labels[i]), &font);
     }
 
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
 }
 

src/preferences/dun/DUNWindow.cpp

@@ -357 +357 @@
             connectbutton->SetEnabled(false);
             //debug
             BAlert *errormsg = new BAlert("errormsg", "The hidden wispy bush\nOver the green flower\nThe sea and connection have stopped.", "   Haiku Error ;)   " , NULL, NULL, B_WIDTH_FROM_WIDEST, B_IDEA_ALERT);
-            errormsg->SetShortcut(0, B_ESCAPE);
+            errormsg->SetFlags(B_CLOSE_ON_ESCAPE);
             errormsg->Go();
         }   
             break;
@@ -367 +367 @@
             disconnectbutton->SetEnabled(false);
             connectbutton->SetEnabled(true);
             BAlert *errormsg = new BAlert("errormsg", "A late long rain\nOver an icy meadow\nBroken connection and dreams.", "   Haiku Error ;)   ", NULL , NULL, B_WIDTH_FROM_WIDEST, B_IDEA_ALERT);               
-            errormsg->SetShortcut(0, B_ESCAPE);
+            errormsg->SetFlags(B_CLOSE_ON_ESCAPE);
             errormsg->Go();
         }    
             break;
@@ -376 +376 @@
         {
             // debug
             BAlert *errormsg = new BAlert("errormsg", "Hark! Something is wrong.\nFor this is not what I asked.\n\nMy life is somewhat ... Incomplete.\n", "   Haiku Error ;)   " , NULL, NULL, B_WIDTH_FROM_WIDEST, B_IDEA_ALERT);
-            errormsg->SetShortcut(0, B_ESCAPE);
+            errormsg->SetFlags(B_CLOSE_ON_ESCAPE);
             errormsg->Go();
         }
             break;
@@ -385 +385 @@
         {
             // debug
             BAlert *errormsg = new BAlert("errormsg", "Lost Clouds.\nDisappear behind the mountains.\n\nFor an eternity must I wait ?\n", "   Haiku Error ;)   " , NULL, NULL, B_WIDTH_FROM_WIDEST, B_IDEA_ALERT);
-            errormsg->SetShortcut(0, B_ESCAPE);
+            errormsg->SetFlags(B_CLOSE_ON_ESCAPE);
             errormsg->Go();
         }
             break;

src/preferences/filetypes/ApplicationTypeWindow.cpp

@@ -1025 +1025 @@
             B_TRANSLATE("Do you want to save the changes?"),
             B_TRANSLATE("Quit, don't save"), B_TRANSLATE("Cancel"),
             B_TRANSLATE("Save"), B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        alert->SetShortcut(1, B_ESCAPE);
+
         int32 choice = alert->Go();
         switch (choice) {
             case 0:

src/preferences/filetypes/FileTypes.cpp

@@ -227 +227 @@
                 "%s"),
                 ref.name, strerror(status));
 
-            (new BAlert(B_TRANSLATE("FileTypes request"),
+            BAlert* alert = new BAlert(B_TRANSLATE("FileTypes request"),
                 buffer, B_TRANSLATE("OK"), NULL, NULL,
-                B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
+                B_WIDTH_AS_USUAL, B_STOP_ALERT);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
 
             message->RemoveData("refs", --index);
             continue;
@@ -475 +477 @@
             strerror(status));
     }
 
-    (new BAlert(B_TRANSLATE("FileTypes request"),
+    BAlert* alert = new BAlert(B_TRANSLATE("FileTypes request"),
         status == B_OK ? message : warning,
-        B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL, type))->Go();
+        B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL, type);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
 }
 
 

src/preferences/filetypes/FileTypesWindow.cpp

@@ -679 +679 @@
                     "group, hold down the Shift key and press \"Remove\"."),
                     B_TRANSLATE("Remove"), B_SHIFT_KEY, B_TRANSLATE("Cancel"),
                     0, NULL, 0, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+                alert->SetShortcut(1, B_ESCAPE);
             } else {
                 alert = new BAlert(B_TRANSLATE("FileTypes request"),
                     B_TRANSLATE("Removing a file type cannot be reverted.\n"
                     "Are you sure you want to remove it?"),
                     B_TRANSLATE("Remove"), B_TRANSLATE("Cancel"),
                     NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+                alert->SetShortcut(1, B_ESCAPE);
             }
             if (alert->Go())
                 break;

src/preferences/filetypes/PreferredAppMenu.cpp

@@ -291 +291 @@
             description[0] ? description : preferred);
 
         BAlert* alert = new BAlert(B_TRANSLATE("FileTypes request"), warning,
-            B_TRANSLATE("Set Preferred Application"), B_TRANSLATE("Cancel"),
+            B_TRANSLATE("Set preferred application"), B_TRANSLATE("Cancel"),
             NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        alert->SetShortcut(1, B_ESCAPE);
         if (alert->Go() == 1)
             return B_ERROR;
     }

src/preferences/fonts/main.cpp

@@ -50 +50 @@
     font.SetSize(18);
     font.SetFace(B_BOLD_FACE);
     view->SetFontAndColor(0, 5, &font);
-
+    
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
 }
 

src/preferences/joysticks/JoyWin.cpp

@@ -49 +49 @@
 ShowMessage(char* string)
 {
     BAlert *alert = new BAlert("Message", string, "OK");
-    alert->SetShortcut(1, B_ESCAPE);
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     return alert->Go();
 }
 
@@ -437 +437 @@
     str << " for a driver designed for Haiku or BeOS.";
 
     BAlert *alert = new BAlert("test1", str.String(), "OK");
-    alert->SetShortcut(0, B_ENTER);
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
 }
 
@@ -448 +448 @@
     str << joy << " device connected to the port '" << port << "'.";
 
     BAlert *alert = new BAlert("test1", str.String(), "Stop");
-    alert->SetShortcut(0, B_ENTER);
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
 }
 

src/preferences/keyboard/Keyboard.cpp

@@ -35 +35 @@
                 B_TRANSLATE("Something has gone wrong!"),
                 B_TRANSLATE("OK"), NULL, NULL,
                 B_WIDTH_AS_USUAL, B_OFFSET_SPACING, B_WARNING_ALERT);
+            errorAlert->SetFlags(B_CLOSE_ON_ESCAPE);
             errorAlert->Go();
             be_app->PostMessage(B_QUIT_REQUESTED);
             break;
@@ -49 +50 @@
 void
 KeyboardApplication::AboutRequested()
 {
-    (new BAlert("about", B_TRANSLATE("Written by Andrew Edward McCall"),
-        B_TRANSLATE("OK")))->Go();
+    BAlert* alert = new BAlert("about",
+        B_TRANSLATE("Written by Andrew Edward McCall"), B_TRANSLATE("OK"));
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
+    alert->Go();
 }
 
 

src/preferences/locale/LocaleWindow.cpp

@@ -147 +147 @@
                 "use this preflet!"),
             B_TRANSLATE("OK"), NULL, NULL,
             B_WIDTH_AS_USUAL, B_OFFSET_SPACING, B_STOP_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
     }
 

src/preferences/mail/AutoConfigWindow.cpp

@@ -95 +95 @@
                     invalidMailAlert = new BAlert("invalidMailAlert",
                         B_TRANSLATE("Enter a valid e-mail address."),
                         B_TRANSLATE("OK"));
+                    invalidMailAlert->SetFlags(B_CLOSE_ON_ESCAPE);
                     invalidMailAlert->Go();
                     return;
                 }

src/preferences/mail/ConfigWindow.cpp

@@ -866 +866 @@
                 "\nThe general settings couldn't be reverted.\n\n"
                 "Error retrieving general settings:\n%s\n"),
             strerror(status));
-        (new BAlert(B_TRANSLATE("Error"), text, B_TRANSLATE("OK"), NULL, NULL,
-            B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+        BAlert* alert = new BAlert(B_TRANSLATE("Error"), text,
+            B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
     }
 
     // revert account data

src/preferences/mail/FilterConfigView.cpp

@@ -460 +460 @@
 
             MailAddonSettings* mailSettings = _GetCurrentMailSettings();
             if (!mailSettings->MoveFilterSettings(from, to)) {
-                (new BAlert("E-mail", B_TRANSLATE("The filter could not be "
-                    "moved. Deleting filter."), B_TRANSLATE("OK")))->Go();
+                BAlert* alert = new BAlert("E-mail",
+                    B_TRANSLATE("The filter could not be moved. Deleting "
+                    "filter."), B_TRANSLATE("OK"));
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
+                alert->Go();
                 fListView->RemoveItem(to);
                 break;
             }    

src/preferences/media/MediaWindow.cpp

@@ -436 +436 @@
             B_TRANSLATE("Quit"),
             B_TRANSLATE("Start media server"), NULL,
             B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-        if (alert->Go()==0)
+        alert->SetShortcut(0, B_ESCAPE);
+        if (alert->Go() == 0)
             return B_ERROR;
 
         fAlert = new MediaAlert(BRect(0, 0, 300, 60),
@@ -565 +566 @@
     printf("%s\n", errorMessage);
     BAlert* alert = new BAlert("BAlert", errorMessage, B_TRANSLATE("OK"),
         NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
     exit(1);
 }

src/preferences/mouse/Mouse.cpp

@@ -34 +34 @@
 void
 MouseApplication::AboutRequested()
 {
-    (new BAlert("about", B_TRANSLATE("...by Andrew Edward McCall"),
-        B_TRANSLATE("Dig Deal")))->Go();
+    BAlert* alert = new BAlert("about",
+        B_TRANSLATE("...by Andrew Edward McCall"), B_TRANSLATE("Dig Deal"));
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
+    alert->Go();
 }
 
 

src/preferences/network/EthernetSettingsView.cpp

@@ -589 +589 @@
     status_t status = interface.AutoConfigure(AF_INET);
 
     if (status == B_BAD_PORT_ID) {
-        (new BAlert("error", B_TRANSLATE("The net_server needs to run for "
-            "the auto configuration!"), B_TRANSLATE("OK")))->Go();
+        BAlert* alert = new BAlert("error", B_TRANSLATE("The net_server needs to run for "
+            "the auto configuration!"), B_TRANSLATE("OK"));
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
     } else if (status != B_OK) {
         BString errorMessage(B_TRANSLATE("Auto-configuring failed: "));
         errorMessage << strerror(status);
-        (new BAlert("error", errorMessage.String(), "OK"))->Go();
+        BAlert* alert = new BAlert("error", errorMessage.String(), "OK");
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
     }
 
     return status;

src/preferences/network_old/BackupWindow.cpp

@@ -63 +63 @@
             }
             else {
                 BAlert *alert = new BAlert("Backup Info Alert","You must specify a name.","OK");
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
                 alert->Go();
             }   
             break;

src/preferences/network_old/LoginInfo.cpp

@@ -63 +63 @@
                     else {
                         BAlert *alert = new BAlert("Login Info Alert",
                             "Passwords don't match. Please try again","OK");
+                        alert->SetFlags(B_CLOSE_ON_ESCAPE);
                         alert->Go();
                     }   
                     
             }
             else {
             
-                BAlert *alert = new BAlert("Login Info Alert","You didn't fill all the fields","Oups...",NULL,NULL,B_WIDTH_FROM_WIDEST,B_INFO_ALERT);
+                BAlert *alert = new BAlert("Login Info Alert",
+                    "You didn't fill in all the fields","Oops...", NULL, NULL,
+                    B_WIDTH_FROM_WIDEST,B_INFO_ALERT);
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
                 alert->Go();
             }   
             break;

src/preferences/network_old/NetworkWindow.cpp

@@ -457 +457 @@
 NetworkWindow::QuitRequested(void)
 {
     if (fSave->IsEnabled() == true) {
-        BAlert *alert = new BAlert("Save Info Alert","Save changes before quitting?",
-                                    "Don't Save","Cancel","Save");
+        BAlert *alert = new BAlert("Save Info Alert", "Save changes before "
+            quitting?", "Don't Save", "Cancel", "Save");
+        alert->SetShortcut(1, B_ESCAPE);
         int32 result = alert->Go();
         
         switch (result) {
@@ -486 +487 @@
 
 void NetworkWindow::DeleteConfigFile()
 {
-    BAlert *alert = new BAlert("Alert","Really delete networking configuration?",
-                                "Delete","Cancel");
+    BAlert *alert = new BAlert("Alert", "Really delete networking configuration?",
+                                "Delete", "Cancel");
+    alert->SetShortcut(1, B_ESCAPE);
     int32 result = alert->Go();
     
     if (result == 0) {

src/preferences/notifications/DisplayView.cpp

@@ -107 +107 @@
                 "It's possible you don't have write access to the "
                 "settings directory."), B_TRANSLATE("OK"), NULL, NULL,
             B_WIDTH_AS_USUAL, B_STOP_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         (void)alert->Go();
     }
 
@@ -176 +177 @@
             B_TRANSLATE("Can't save preferenes, you probably don't have "
                 "write access to the settings directory or the disk is full."),
                 B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         (void)alert->Go();
         return ret;
     }

src/preferences/notifications/GeneralView.cpp

@@ -136 +136 @@
                         " found, this means your InfoPopper installation was"
                         " not successfully completed."), B_TRANSLATE("OK"),
                         NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+                    alert->SetFlags(B_CLOSE_ON_ESCAPE);
                     (void)alert->Go();
                     return;
                 }
@@ -153 +154 @@
                             "cannot be stopped, because the server can't be"
                             " reached."), B_TRANSLATE("OK"), NULL, NULL,
                             B_WIDTH_AS_USUAL, B_STOP_ALERT);
+                        alert->SetFlags(B_CLOSE_ON_ESCAPE);
                         (void)alert->Go();
                         return;
                     }
@@ -164 +166 @@
                             " notifications because the server can't be "
                             "reached."), B_TRANSLATE("OK"),
                             NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+                        alert->SetFlags(B_CLOSE_ON_ESCAPE);
                         (void)alert->Go();
                         return;
                     }
@@ -181 +184 @@
                             " was not successfully completed."),
                             B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL,
                             B_STOP_ALERT);
+                        alert->SetFlags(B_CLOSE_ON_ESCAPE);
                         (void)alert->Go();
                         return;
                     }
@@ -215 +219 @@
                 "It's possible you don't have write access to the "
                 "settings directory."), B_TRANSLATE("OK"), NULL, NULL,
             B_WIDTH_AS_USUAL, B_STOP_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         (void)alert->Go();
     }
 
@@ -270 +275 @@
             B_TRANSLATE("An error occurred saving the preferences.\n"
                 "It's possible you are running out of disk space."),
             B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         (void)alert->Go();
         return ret;
     }
@@ -296 +302 @@
             "write access to the boot settings directory."), B_TRANSLATE("OK"),
             NULL, NULL,
             B_WIDTH_AS_USUAL, B_STOP_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         (void)alert->Go();
         return ret;
     }
@@ -316 +323 @@
                 "you probably don't have write permission to the boot settings"
                 " directory."), B_TRANSLATE("OK"), NULL, NULL,
                 B_WIDTH_AS_USUAL, B_STOP_ALERT);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             (void)alert->Go();
             return ret;
         }

src/preferences/notifications/NotificationsView.cpp

@@ -184 +184 @@
                 "It's possible you don't have write access to the "
                 "settings directory."), B_TRANSLATE("OK"), NULL, NULL,
             B_WIDTH_AS_USUAL, B_STOP_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         (void)alert->Go();
         return B_ERROR;
     }

src/preferences/screen/ScreenApplication.cpp

@@ -40 +40 @@
     BAlert *aboutAlert = new BAlert(B_TRANSLATE("About"),
         B_TRANSLATE("Screen preferences by the Haiku team"), B_TRANSLATE("OK"),
         NULL, NULL, B_WIDTH_AS_USUAL, B_OFFSET_SPACING, B_INFO_ALERT);
-    aboutAlert->SetShortcut(0, B_OK);
+    aboutAlert->SetFlags(B_CLOSE_ON_ESCAPE);
     aboutAlert->Go();
 }
 

src/preferences/screen/ScreenWindow.cpp

@@ -520 +520 @@
             BString warning = B_TRANSLATE("Could not write VESA mode settings"
                 " file:\n\t");
             warning << strerror(status);
-            (new BAlert(B_TRANSLATE("Warning"), warning.String(), B_TRANSLATE("OK"), NULL,
-                NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+            BAlert* alert = new BAlert(B_TRANSLATE("Warning"),
+                warning.String(), B_TRANSLATE("OK"), NULL,
+                NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
         }
     }
 
@@ -1303 +1306 @@
         BAlert* alert = new BAlert(B_TRANSLATE("Warning"), message,
             B_TRANSLATE("OK"), NULL, NULL,
             B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         alert->Go();
     }
 }

src/preferences/screensaver/PasswordWindow.cpp

@@ -184 +184 @@
                     BAlert *alert = new BAlert("noMatch",
                         B_TRANSLATE("Passwords don't match. Please try again."),
                         B_TRANSLATE("OK"));
+                    alert->SetFlags(B_CLOSE_ON_ESCAPE);
                     alert->Go();
                     break;
                 }

src/preferences/shortcuts/ShortcutsWindow.cpp

@@ -286 +286 @@
             B_TRANSLATE("Really quit without saving your changes?"),
             B_TRANSLATE("Don't save"), B_TRANSLATE("Cancel"),
             B_TRANSLATE("Save"));
+        alert->SetShortcut(1, B_ESCAPE);
         switch(alert->Go()) {
             case 1:
                 ret = false;
@@ -296 +297 @@
                 // up the file requester
                 if (fLastSaved.InitCheck() == B_OK) {
                     if (_SaveKeySet(fLastSaved) == false) {
-                        (new BAlert(ERROR, 
+                        BAlert* alert = new BAlert(ERROR, 
                             B_TRANSLATE("Shortcuts was unable to save your "
                                 "KeySet file!"), 
-                            B_TRANSLATE("Oh no")))->Go();
+                            B_TRANSLATE("Oh no"));
+                        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+                        alert->Go();
                         ret = true; //quit anyway
                     }
                 } else {
@@ -550 +553 @@
                             fLastSaved = BEntry(&ref);
                             break;
                         } else {
-                            (new BAlert(ERROR, 
+                            BAlert* alert = new BAlert(ERROR, 
                                 B_TRANSLATE("Shortcuts was couldn't open your "
-                                "KeySet file!"), B_TRANSLATE("OK")))->Go(NULL);
+                                "KeySet file!"), B_TRANSLATE("OK"));
+                            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+                            alert->Go(NULL);
                             break;
                         }
                     }
@@ -576 +581 @@
                     _GetSettingsFile(&eref);
                     if (ref == eref) fKeySetModified = false;
                 } else {
-                    (new BAlert(ERROR, 
+                    BAlert* alert = new BAlert(ERROR, 
                         B_TRANSLATE("Shortcuts was unable to parse your "
-                        "KeySet file!"), 
-                        B_TRANSLATE("OK")))->Go(NULL);
+                        "KeySet file!"), B_TRANSLATE("OK"));
+                    alert->SetFlags(B_CLOSE_ON_ESCAPE);
+                    alert->Go(NULL);
                     break;
                 }
             }
@@ -629 +635 @@
             } else PostMessage(SAVE_KEYSET_AS); // open the save requester...
 
             if (showSaveError) {
-                (new BAlert(ERROR, 
+                BAlert* alert = new BAlert(ERROR, 
                     B_TRANSLATE("Shortcuts wasn't able to save your keyset."), 
-                    B_TRANSLATE("OK")))->Go(NULL);
+                    B_TRANSLATE("OK"));
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
+                alert->Go(NULL);
             }
             break;
         }

src/preferences/sounds/HApp.cpp

@@ -49 +49 @@
             "  Original work from Atsushi Takamatsu.\n"
             "Copyright ©2003-2006 Haiku"),
         B_TRANSLATE("OK"));
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
 }
 

src/preferences/sounds/HEventList.cpp

@@ -127 +127 @@
             BMediaFiles().RemoveRefFor(fType, row->Name(), ref);
             BAlert* alert = new BAlert("alert",
                 B_TRANSLATE("No such file or directory"), B_TRANSLATE("OK"));
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             alert->Go();
             return;
         }

src/preferences/sounds/HWindow.cpp

@@ -212 +212 @@
                         B_TRANSLATE("This is not an audio file."),
                         B_TRANSLATE("OK"), NULL, NULL,
                         B_WIDTH_AS_USUAL, B_STOP_ALERT);
+                    alert->SetFlags(B_CLOSE_ON_ESCAPE);
                     alert->Go();
                     break;
                 }

src/preferences/time/NetworkTimeView.cpp

@@ -377 +377 @@
                         "while synchronizing:\r\n%s"),
                         errorString);
 
-                (new BAlert(B_TRANSLATE("Time"), buffer, 
-                    B_TRANSLATE("OK")))->Go();
+                BAlert* alert = new BAlert(B_TRANSLATE("Time"), buffer, 
+                    B_TRANSLATE("OK"));
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
+                alert->Go();
             }
             break;
         }

src/preferences/time/Time.cpp

@@ -59 +59 @@
         "Time & Date, written by:\n\n\tAndrew Edward McCall\n\tMike Berg\n\t"
         "Julun\n\tPhilippe Saint-Pierre\n\nCopyright 2004-2012, Haiku."),
         B_TRANSLATE("OK"));
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
 }
 

src/preferences/touchpad/TouchpadPrefView.cpp

@@ -106 +106 @@
             "normal mouse operation. Do you really want to change it?"),
             B_TRANSLATE("OK"), B_TRANSLATE("Cancel"),
             NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        alert->SetShortcut(1, B_ESCAPE);
         result = alert->Go();
     }
     if (result == 0) {

src/preferences/virtualmemory/SettingsWindow.cpp

@@ -237 +237 @@
     status_t result = fSettings.SwapVolume().InitCheck();
 
     if (result != B_OK) {
-        int32 choice = (new BAlert("VirtualMemory", B_TRANSLATE(
+        BAlert* alert = new BAlert("VirtualMemory", B_TRANSLATE(
             "The swap volume specified in the settings file is invalid.\n"
             "You can keep the current setting or switch to the "
             "default swap volume."),
             B_TRANSLATE("Keep"), B_TRANSLATE("Switch"), NULL,
-            B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+            B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        alert->SetShortcut(0, B_ESCAPE);
+        int32 choice = alert->Go();
         if (choice == 1) {
             BVolumeRoster volumeRoster;
             BVolume bootVolume;
@@ -293 +295 @@
                 // ToDo: maybe we want to remove this possibility in the GUI
                 // as Be did, but I thought a proper warning could be helpful
                 // (for those that want to change that anyway)
-                int32 choice = (new BAlert("VirtualMemory",
+                BAlert* alert = new BAlert("VirtualMemory",
                     B_TRANSLATE(
                     "Disabling virtual memory will have unwanted effects on "
                     "system stability once the memory is used up.\n"
@@ -301 +303 @@
                     "until this point is reached.\n\n"
                     "Are you really sure you want to turn it off?"),
                     B_TRANSLATE("Turn off"), B_TRANSLATE("Keep enabled"), NULL,
-                    B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
+                    B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+                alert->SetShortcut(1, B_ESCAPE);
+                int32 choice = alert->Go();
                 if (choice == 1) {
                     fSwapEnabledCheckBox->SetValue(1);
                     break;

src/preferences/virtualmemory/VirtualMemory.cpp

@@ -50 +50 @@
     font.SetFace(B_BOLD_FACE);
     view->SetFontAndColor(0, 13, &font);
 
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go();
 }
 

src/servers/bluetooth/DeskbarReplicant.cpp

@@ -242 +242 @@
 {
     msg << "\n\nError: " << strerror(status);
     BAlert* alert = new BAlert("Bluetooth error", msg.String(), "OK");
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go(NULL);
 }
 

src/servers/debug/DebugServer.cpp

@@ -689 +689 @@
         BAlert *alert = new BAlert(NULL, buffer.String(),
             B_TRANSLATE("Debug"), B_TRANSLATE("OK"), NULL,
             B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
         int32 result = alert->Go();
         kill = (result == 1);
         _NotifyRegistrar(fTeam, false, !kill);

src/servers/input/MethodReplicant.cpp

@@ -137 +137 @@
 
     switch (message->what) {
         case B_ABOUT_REQUESTED:
-            (new BAlert("About Method Replicant",
+        {
+            BAlert* alert = new BAlert("About Method Replicant",
                 "Method Replicant (Replicant)\n"
                 "  Brought to you by Jérôme DUVAL.\n\n"
-                "Haiku, 2004-2009", "OK"))->Go();
+                "Haiku, 2004-2009", "OK");
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
+            alert->Go();
             break;
+        }
         case IS_UPDATE_NAME:
             UpdateMethodName(message);
             break;

src/servers/mail/MailDaemon.cpp

@@ -306 +306 @@
                 BAlert* alert = new BAlert(B_TRANSLATE("New Messages"),
                     fAlertString.String(), "OK", NULL, NULL, B_WIDTH_AS_USUAL);
                 alert->SetFeel(B_NORMAL_WINDOW_FEEL);
+                alert->SetFlags(B_CLOSE_ON_ESCAPE);
                 alert->Go(NULL);
                 fAlertString = B_EMPTY_STRING;
             }

src/servers/media/media_server.cpp

@@ -219 +219 @@
     if (err == B_OK)
         return;
 
-    (new BAlert("media_server", "Launching media_addon_server failed.\n\n"
-        "media_server will terminate", "OK"))->Go();
+    BAlert* alert = new BAlert("media_server", "Launching media_addon_server "
+        "failed.\n\nmedia_server will terminate", "OK");
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go();
     fprintf(stderr, "Launching media_addon_server (%s) failed: %s\n",
         B_MEDIA_ADDON_SERVER_SIGNATURE, strerror(err));
     exit(1);

src/servers/midi/MidiServerApp.cpp

@@ -62 +62 @@
 void
 MidiServerApp::AboutRequested()
 {
-    (new BAlert(0,
+    BAlert* alert = new BAlert(0,
         "Haiku midi_server 1.0.0 alpha\n\n"
         "notes disguised as bytes\n"
         "propagating to endpoints,\n"
         "an aural delight",
-        "Okay", 0, 0, B_WIDTH_AS_USUAL, 
-        B_INFO_ALERT))->Go();
+        "OK", 0, 0, B_WIDTH_AS_USUAL, 
+        B_INFO_ALERT);
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
+    alert->Go();
 }
 
 

src/servers/mount/AutoMounter.cpp

@@ -569 +569 @@
         char text[512];
         snprintf(text, sizeof(text),
             B_TRANSLATE("Error mounting volume:\n\n%s"), strerror(status));
-        (new BAlert(B_TRANSLATE("Mount error"), text,
-            B_TRANSLATE("OK")))->Go(NULL);
+        BAlert* alert = new BAlert(B_TRANSLATE("Mount error"), text,
+            B_TRANSLATE("OK"));
+        alert->SetFlags(B_CLOSE_ON_ESCAPE);
+        alert->Go(NULL);
     }
 }
 
@@ -603 +605 @@
     snprintf(text, sizeof(text), B_TRANSLATE("Could not unmount disk "
         "\"%s\":\n\t%s"), name, strerror(error));
 
-    (new BAlert(B_TRANSLATE("Unmount error"), text, B_TRANSLATE("OK"),
-        NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go(NULL);
+    BAlert* alert = new BAlert(B_TRANSLATE("Unmount error"), text,
+        B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
+    alert->Go(NULL);
 }
 
 

src/servers/net/NetServer.cpp

@@ -238 +238 @@
     font.SetFace(B_BOLD_FACE);
     view->SetFontAndColor(0, 17, &font);
 
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go(NULL);
 }
 

src/servers/notification/NotificationWindow.cpp

@@ -440 +440 @@
             BAlert* alert = new BAlert(B_TRANSLATE("Warning"),
                     B_TRANSLATE("Couldn't start filter monitor."
                         " Live filter changes disabled."), B_TRANSLATE("Darn."));
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             alert->Go();
         }
     }
@@ -504 +505 @@
             BAlert* alert = new BAlert(B_TRANSLATE("Warning"),
                         B_TRANSLATE("Couldn't start general settings monitor.\n"
                         "Live filter changes disabled."), B_TRANSLATE("OK"));
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             alert->Go();
         }
     }
@@ -555 +557 @@
             BAlert* alert = new BAlert(B_TRANSLATE("Warning"),
                 B_TRANSLATE("Couldn't start display settings monitor.\n"
                     "Live filter changes disabled."), B_TRANSLATE("OK"));
+            alert->SetFlags(B_CLOSE_ON_ESCAPE);
             alert->Go();
         }
     }

src/servers/print/ConfigWindow.cpp

@@ -309 +309 @@
 
     BAlert *about = new BAlert("About printer server", text.String(),
         B_TRANSLATE("OK"));
+    about->SetFlags(B_CLOSE_ON_ESCAPE);
     about->Go();
 }
 

src/servers/print/PrintServerApp.R5.cpp

@@ -97 +97 @@
                         B_TRANSLATE("Would you like to set one up now?"));
                     BAlert* alert = new BAlert("Info", alertText.String(),
                         B_TRANSLATE("No"), B_TRANSLATE("Yes"));
+                    alert->SetShortcut(0, B_ESCAPE);
                     if (alert->Go() == 1) {
                         if (count == 0)
                             run_add_printer_panel();
@@ -143 +144 @@
                         text.ReplaceFirst("@", printerName.String());
                         BAlert* alert = new BAlert("", text.String(),
                             B_TRANSLATE("No"), B_TRANSLATE("Yes"));
+                        alert->SetShortcut(0, B_ESCAPE);
                         if (alert->Go() == 1)
                             p->app->SelectPrinter(printerName.String());
                     }

src/servers/registrar/ShutdownProcess.cpp

@@ -1256 +1256 @@
         BAlert* alert = new BAlert(title.String(), text,
             B_TRANSLATE("Cancel"), otherText, defaultText,
             B_WIDTH_AS_USUAL, B_WARNING_ALERT);
-        alert->SetShortcut(0, B_ESCAPE);
         // We want the alert to behave more like a regular window...
         alert->SetFeel(B_NORMAL_WINDOW_FEEL);
         // ...but not quit. Minimizing the alert would prevent the user from
         // finding it again, since registrar does not have an entry in the
         // Deskbar.
-        alert->SetFlags(alert->Flags() | B_NOT_MINIMIZABLE);
+        alert->SetFlags(alert->Flags() | B_NOT_MINIMIZABLE | B_CLOSE_ON_ESCAPE);
         alert->SetWorkspaces(B_ALL_WORKSPACES);
         int32 result = alert->Go();
 

src/servers/syslog_daemon/SyslogDaemon.cpp

@@ -73 +73 @@
     font.SetFace(B_BOLD_FACE);          
     view->SetFontAndColor(0, name.Length(), &font);
 
+    alert->SetFlags(B_CLOSE_ON_ESCAPE);
     alert->Go(NULL);
 }