Don't steal VK_RETURN for wxEVT_COMMAND_LIST_ITEM_ACTIVATED if any of

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

diff --git a/wxPython/src/msw/_misc_wrap.cpp b/wxPython/src/msw/_misc_wrap.cpp
index d7da56f718c39e63fc7cb9865bae90f0d0d93df9..13416c743586b8dee0ce91af36f9f60b00822f58 100644 (file)
--- a/wxPython/src/msw/_misc_wrap.cpp
+++ b/wxPython/src/msw/_misc_wrap.cpp
@@ -3011,6 +3011,12 @@ wxPyTimer::wxPyTimer(wxEvtHandler *owner, int id)
         SetOwner(this);
 }
 
         SetOwner(this);
 }
 

+wxPyTimer::~wxPyTimer()
+{
+//    printf("-=* ~wxPyTimer\n");
+}
+
+

 
 SWIGINTERN swig_type_info*
 SWIG_pchar_descriptor()
 
 SWIGINTERN swig_type_info*
 SWIG_pchar_descriptor()


@@ -9183,23 +9189,34 @@ SWIGINTERN PyObject *WindowDisabler_swiginit(PyObject *SWIGUNUSEDPARM(self), PyO
 SWIGINTERN PyObject *_wrap_new_BusyInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxString *arg1 = 0 ;
 SWIGINTERN PyObject *_wrap_new_BusyInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxString *arg1 = 0 ;

+  wxWindow *arg2 = (wxWindow *) NULL ;

   wxBusyInfo *result = 0 ;
   bool temp1 = false ;
   wxBusyInfo *result = 0 ;
   bool temp1 = false ;

+  void *argp2 = 0 ;
+  int res2 = 0 ;

   PyObject * obj0 = 0 ;
   PyObject * obj0 = 0 ;

+  PyObject * obj1 = 0 ;

   char *  kwnames[] = {
   char *  kwnames[] = {

-    (char *) "message", NULL 
+    (char *) "message",(char *) "parent", NULL 

   };
   
   };
   

-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_BusyInfo",kwnames,&obj0)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_BusyInfo",kwnames,&obj0,&obj1)) SWIG_fail;

   {
     arg1 = wxString_in_helper(obj0);
     if (arg1 == NULL) SWIG_fail;
     temp1 = true;
   }
   {
     arg1 = wxString_in_helper(obj0);
     if (arg1 == NULL) SWIG_fail;
     temp1 = true;
   }

+  if (obj1) {
+    res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_BusyInfo" "', expected argument " "2"" of type '" "wxWindow *""'"); 
+    }
+    arg2 = reinterpret_cast< wxWindow * >(argp2);
+  }

   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   {
     if (!wxPyCheckForApp()) SWIG_fail;
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (wxBusyInfo *)new wxBusyInfo((wxString const &)*arg1);
+    result = (wxBusyInfo *)new wxBusyInfo((wxString const &)*arg1,arg2);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }