Don't steal VK_RETURN for wxEVT_COMMAND_LIST_ITEM_ACTIVATED if any of

[wxWidgets.git] / wxPython / src / msw / _core_wrap.cpp

diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp
index c6a7b1bc0d734cf49d85236e62d3c79e1b4a7d7f..54783f12372e0cf94c9a00267b2768a50bbb1f7b 100644 (file)
--- a/wxPython/src/msw/_core_wrap.cpp
+++ b/wxPython/src/msw/_core_wrap.cpp
@@ -41297,6 +41297,7 @@ SWIGINTERN PyObject *_wrap_Window_FromHWND(PyObject *SWIGUNUSEDPARM(self), PyObj
   } 
   arg2 = static_cast< unsigned long >(val2);
   {
+    if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     result = (wxWindow *)wxWindow_FromHWND(arg1,arg2);
     wxPyEndAllowThreads(__tstate);
@@ -45671,7 +45672,7 @@ SWIGINTERN PyObject *MenuBar_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *
 SWIGINTERN PyObject *_wrap_new_MenuItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxMenu *arg1 = (wxMenu *) NULL ;
-  int arg2 = (int) wxID_ANY ;
+  int arg2 = (int) wxID_SEPARATOR ;
   wxString const &arg3_defvalue = wxPyEmptyString ;
   wxString *arg3 = (wxString *) &arg3_defvalue ;
   wxString const &arg4_defvalue = wxPyEmptyString ;