From ab7c994bd3c2b6bd01c98a925120deeb3e2a7754 Mon Sep 17 00:00:00 2001
From: Alexander Zolotov <Alexander.Zolotov@jetbrains.com>
Date: Sun, 29 Jun 2014 16:14:00 +0400
Subject: [PATCH] MacMessages: select 'Cancel' result on Escape even if dialog
 doesn't contain 'Cancel'-button.

---
 .../src/com/intellij/ui/messages/SheetController.java     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ui/messages/SheetController.java b/platform/platform-impl/src/com/intellij/ui/messages/SheetController.java
index 98e8ce7213a2..2d76d6391ee8 100755
--- a/platform/platform-impl/src/com/intellij/ui/messages/SheetController.java
+++ b/platform/platform-impl/src/com/intellij/ui/messages/SheetController.java
@@ -16,7 +16,9 @@
 package com.intellij.ui.messages;
 
 import com.intellij.icons.AllIcons;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.ui.Gray;
 import com.intellij.ui.JBColor;
@@ -34,7 +36,6 @@ import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.net.URISyntaxException;
-import com.intellij.openapi.diagnostic.Logger;
 
 /**
  * Created by Denis Fokin
@@ -120,9 +121,6 @@ public class SheetController {
       if (buttonTitle.equals(focusedButton)) {
         myFocusedButton = buttons[i];
       }
-      if (buttonTitle.equals("Cancel")) {
-        myResult = "Cancel";
-      }
     }
 
     if (myFocusedButton == null) {
@@ -130,7 +128,7 @@ public class SheetController {
     }
 
     if (myResult == null) {
-      myResult = buttonTitles[0];
+      myResult = Messages.CANCEL_BUTTON;
     }
 
     mySheetPanel = createSheetPanel(title, message, buttons);