Enter won't close dialog if [Ok] button is disabled

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 0442867815c35340b417ae9d282a155d492bd3aa..5f6bf803cf205592eb1ef19ad8921c1c579a57aa 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1540,7 +1540,7 @@ bool wxWindow::MSWProcessMessage(WXMSG* pMsg)
                                 btn = panel->GetDefaultItem();
                             }
 
-                            if ( btn )
+                            if ( btn && btn->IsEnabled() )
                             {
                                 // if we do have a default button, do press it
                                 btn->MSWCommand(BN_CLICKED, 0 /* unused */);