From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 9 Apr 2007 21:28:27 +0000 (+0000)
Subject: make Enter/Return activate the default button (second version of patch 1696563)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/28117f242619e904d18c2d8f1a7b9fa0783efcb6

make Enter/Return activate the default button (second version of patch 1696563)


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

diff --git a/docs/changes.txt b/docs/changes.txt
index e212d89871..5fa6910dc9 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -130,6 +130,7 @@ wxMSW:
 wxX11:
 
 - Added mouse wheel support (David Hart)
+- Make Enter key activate the default button (David Hart)
 
 
 2.8.4
diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index 75f8f3bc74..c5f8c6e654 100644
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -1412,6 +1412,25 @@ void wxWindow::OnChar(wxKeyEvent& event)
         }
     }
 
+    // if Return was pressed, see if there's a default button to activate
+    if ( !event.HasModifiers() && event.GetKeyCode() == WXK_RETURN )
+    {
+        wxTopLevelWindow *
+            tlw = wxDynamicCast(wxTopLevelWindow *, wxGetTopLevelParent());
+        if ( tlw )
+        {
+            wxButton *btn = wxDynamicCast(wxButton *, tlw->GetDefaultItem());
+            if ( btn )
+            {
+                wxCommandEvent evt(wxEVT_COMMAND_BUTTON_CLICKED, btn->GetId());
+                evt.SetEventObject(btn);
+                btn->Command(evt);
+                return;
+            }
+        }
+    }
+
+
     event.Skip();
 }