Only when wxTE-PROCESS_ENTER has been set.

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

diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index 44d10c8a731b3f8e272ee1fa42cfbea7279e7d42..a15f637dda564761191a956cf7112403f2c451f8 100644 (file)
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -290,7 +290,7 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event )
         }
     }
 
-    if ((event.GetKeyCode() == WXK_RETURN))
+    if ((event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
     {
         wxCommandEvent evt( wxEVT_COMMAND_TEXT_ENTER, m_windowId );
         evt.SetEventObject(this);

diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp
index 44d10c8a731b3f8e272ee1fa42cfbea7279e7d42..a15f637dda564761191a956cf7112403f2c451f8 100644 (file)
--- a/src/gtk1/spinctrl.cpp
+++ b/src/gtk1/spinctrl.cpp
@@ -290,7 +290,7 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event )
         }
     }
 
-    if ((event.GetKeyCode() == WXK_RETURN))
+    if ((event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
     {
         wxCommandEvent evt( wxEVT_COMMAND_TEXT_ENTER, m_windowId );
         evt.SetEventObject(this);