From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 19 Aug 2006 23:19:07 +0000 (+0000)
Subject: don't use the hack with handling wxID_CLOSE button events in wxDialog::OnCancel(... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ba7a4bfbbb278a6026cd3b873e36a733d8ccb399

don't use the hack with handling wxID_CLOSE button events in wxDialog::OnCancel(); simply map Esc to wxID_CLOSE instead


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index 599d310fe9..839f75fb2c 100644
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -210,7 +210,6 @@ wxString wxFileTipProvider::GetTip()
 
 BEGIN_EVENT_TABLE(wxTipDialog, wxDialog)
     EVT_BUTTON(wxID_NEXT_TIP, wxTipDialog::OnNextTip)
-    EVT_BUTTON(wxID_CLOSE, wxTipDialog::OnCancel)
 END_EVENT_TABLE()
 
 wxTipDialog::wxTipDialog(wxWindow *parent,
@@ -229,6 +228,7 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
     // smart phones does not support or do not waste space for wxButtons
 #ifndef __SMARTPHONE__
     wxButton *btnClose = new wxButton(this, wxID_CLOSE);
+    SetEscapeId(wxID_CLOSE);
 #endif
 
     m_checkbox = new wxCheckBox(this, wxID_ANY, _("&Show tips at startup"));