From 97ef78881ca8c384694d8a2da3d2336ae5cc85b3 Mon Sep 17 00:00:00 2001
From: wlux <wlux@72102866-910b-0410-8b05-ffd578937521>
Date: Sun, 15 Aug 2010 20:12:55 +0000
Subject: [PATCH] Dismiss the list of a combo box without changing the
 selection when the user presses Escape.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@31157 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog               | 6 ++++++
 Source/NSComboBoxCell.m | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index bd240dd72..cabea3cf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-15  Wolfgang Lux  <wolfgang.lux@gmail.com>
+
+	* Source/NSComboBoxCell.m (-runLoopWithComboBoxCell:): Dismiss
+	the combo box's list without changing the selection when the user
+	presses Escape.
+
 2010-08-13 Riccardo Mottola
 
 	* Source/NSMatrix.m
diff --git a/Source/NSComboBoxCell.m b/Source/NSComboBoxCell.m
index a70f36bde..6d30aac3c 100644
--- a/Source/NSComboBoxCell.m
+++ b/Source/NSComboBoxCell.m
@@ -465,6 +465,10 @@ static GSComboWindow *gsWindow = nil;
             {
               [self validateSelection];
             }
+	  else if (key == 0x001b)
+	    {
+	      break;
+	    }
           else
             {
 	      [NSApp sendEvent: event];