Commented out wxToolBarSimple since it is fully deprecated now.

[wxWidgets.git] / wxPython / src / helpers.cpp

diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp
index 6da4eb0423d87a0d05ee9c8990a7662bd85b555b..57b971ae57ad73e7bd8d21bfd0b22cd2bf78d6fe 100644 (file)
--- a/wxPython/src/helpers.cpp
+++ b/wxPython/src/helpers.cpp
@@ -384,7 +384,7 @@ void __wxPreStart(PyObject* moduleDict)
 #endif
 
     // Ensure that the build options in the DLL (or whatever) match this build
 #endif
 
     // Ensure that the build options in the DLL (or whatever) match this build

-    wxApp::CheckBuildOptions(wxBuildOptions());
+    wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "wxPython");

 
     // Create an exception object to use for wxASSERTions
     wxPyAssertionError = PyErr_NewException("wxPython.wxc.wxPyAssertionError",
 
     // Create an exception object to use for wxASSERTions
     wxPyAssertionError = PyErr_NewException("wxPython.wxc.wxPyAssertionError",


@@ -1306,29 +1306,50 @@ void wxPyCallback::EventThunker(wxEvent& event) {
     PyObject*       result;
     PyObject*       arg;
     PyObject*       tuple;
     PyObject*       result;
     PyObject*       arg;
     PyObject*       tuple;

-
+    bool            checkSkip = FALSE;

 
     wxPyBeginBlockThreads();
     wxString className = event.GetClassInfo()->GetClassName();
 
 
     wxPyBeginBlockThreads();
     wxString className = event.GetClassInfo()->GetClassName();
 

-    if (className == wxT("wxPyEvent"))
-        arg = ((wxPyEvent*)&event)->GetSelf();
-    else if (className == wxT("wxPyCommandEvent"))
-        arg = ((wxPyCommandEvent*)&event)->GetSelf();
+    // If the event is one of these types then pass the original
+    // event object instead of the one passed to us.
+    if ( className == wxT("wxPyEvent") ) {
+        arg =       ((wxPyEvent*)&event)->GetSelf();
+        checkSkip = ((wxPyEvent*)&event)->GetCloned();
+    }
+    else if ( className == wxT("wxPyCommandEvent") ) {
+        arg =       ((wxPyCommandEvent*)&event)->GetSelf();
+        checkSkip = ((wxPyCommandEvent*)&event)->GetCloned();
+    }

     else {
         arg = wxPyConstructObject((void*)&event, className);
     }
 
     else {
         arg = wxPyConstructObject((void*)&event, className);
     }
 

+    // Call the event handler, passing the event object

     tuple = PyTuple_New(1);
     tuple = PyTuple_New(1);

-    PyTuple_SET_ITEM(tuple, 0, arg);
+    PyTuple_SET_ITEM(tuple, 0, arg);  // steals ref to arg

     result = PyEval_CallObject(func, tuple);
     result = PyEval_CallObject(func, tuple);

-    Py_DECREF(tuple);
-    if (result) {
-        Py_DECREF(result);
+    if ( result ) {
+        Py_DECREF(result);   // result is ignored, but we still need to decref it

         PyErr_Clear();       // Just in case...
     } else {
         PyErr_Print();
     }
         PyErr_Clear();       // Just in case...
     } else {
         PyErr_Print();
     }

+
+    if ( checkSkip ) {
+        // if the event object was one of our special types and
+        // it had been cloned, then we need to extract the Skipped
+        // value from the original and set it in the clone.
+        result = PyObject_CallMethod(arg, "GetSkipped", "");
+        if ( result ) {
+            event.Skip(PyInt_AsLong(result));
+            Py_DECREF(result);
+        } else {
+            PyErr_Print();
+        }
+    }
+
+    Py_DECREF(tuple);

     wxPyEndBlockThreads();
 }
 
     wxPyEndBlockThreads();
 }