From b815c1b44d55e980fe5dd76e6fff128f652de8a3 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 2 Dec 2013 10:38:04 +0000
Subject: [PATCH] Fixed #15717: wxRichTextStyleOrganiserDialog returns wxID_OK
 when closed with Escape key (ikamakj)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/richtext/richtextstyledlg.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/richtext/richtextstyledlg.cpp b/src/richtext/richtextstyledlg.cpp
index 060e0981d9..75e821a694 100644
--- a/src/richtext/richtextstyledlg.cpp
+++ b/src/richtext/richtextstyledlg.cpp
@@ -349,6 +349,9 @@ void wxRichTextStyleOrganiserDialog::CreateControls()
     }
     else
     {
+        // Avoid the Escape key logic falling back on OK after finding
+        // a hidden wxID_CANCEL contol
+        m_closeButton->SetId(wxID_HIGHEST);
         m_buttonSizer->Show(m_closeButton, false);
     }