Changed wxFont, wxPen, wxBrush to not implicitly use the wxTheXXXList

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

diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp
index 1859090e5f4f833c86e005c83aafc7574e937b9e..28d810873f2a315abf7c8521d5bab4fc426fa415 100644 (file)
--- a/wxPython/src/helpers.cpp
+++ b/wxPython/src/helpers.cpp
@@ -109,7 +109,6 @@ void WXDLLEXPORT wxEntryCleanup();
 #ifdef WXP_WITH_THREAD
 PyThreadState*  wxPyEventThreadState = NULL;
 #endif
 #ifdef WXP_WITH_THREAD
 PyThreadState*  wxPyEventThreadState = NULL;
 #endif

-static char* __nullArgv[1] = { 0 };

 
 
 // This is where we pick up the first part of the wxEntry functionality...
 
 
 // This is where we pick up the first part of the wxEntry functionality...


@@ -159,7 +158,7 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args)
     if (!PyArg_ParseTuple(args, "O", &onInitFunc))
         return NULL;
 
     if (!PyArg_ParseTuple(args, "O", &onInitFunc))
         return NULL;
 

-#if 0  // Try it out without this check, soo how it does...
+#if 0  // Try it out without this check, see how it does...

     if (wxTopLevelWindows.Number() > 0) {
         PyErr_SetString(PyExc_TypeError, "Only 1 wxApp per process!");
         return NULL;
     if (wxTopLevelWindows.Number() > 0) {
         PyErr_SetString(PyExc_TypeError, "Only 1 wxApp per process!");
         return NULL;


@@ -447,7 +446,6 @@ int wxPyCallbackHelper::callCallback(PyObject* argTuple) const {
 // Invoke the Python callable object, returning the raw PyObject return
 // value.  Caller should DECREF the return value and also call PyEval_SaveThread.
 PyObject* wxPyCallbackHelper::callCallbackObj(PyObject* argTuple) const {
 // Invoke the Python callable object, returning the raw PyObject return
 // value.  Caller should DECREF the return value and also call PyEval_SaveThread.
 PyObject* wxPyCallbackHelper::callCallbackObj(PyObject* argTuple) const {

-    wxPyCallbackHelper* self = (wxPyCallbackHelper*)this; // cast away const

     PyObject* result;
 
     // Save a copy of the pointer in case the callback generates another
     PyObject* result;
 
     // Save a copy of the pointer in case the callback generates another