Allow comparrisons with None

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

diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp
index c64bcf30b4447ed3d1ba308052135872bcd954c9..99fdb3ce2781796172ffa84b5326ab47aa25365e 100644 (file)
--- a/wxPython/src/helpers.cpp
+++ b/wxPython/src/helpers.cpp
@@ -28,6 +28,10 @@
 #include <wx/gtk/win_gtk.h>
 #endif
 
 #include <wx/gtk/win_gtk.h>
 #endif
 

+#ifdef __WXMAC__
+#include <wx/mac/private.h>
+#endif
+

 #include <wx/clipbrd.h>
 #include <wx/mimetype.h>
 #include <wx/image.h>
 #include <wx/clipbrd.h>
 #include <wx/mimetype.h>
 #include <wx/image.h>


@@ -49,9 +53,10 @@ bool wxPyDoingCleanup = False;
 struct wxPyThreadState {
     unsigned long  tid;
     PyThreadState* tstate;
 struct wxPyThreadState {
     unsigned long  tid;
     PyThreadState* tstate;

+    int            blocked;

 
     wxPyThreadState(unsigned long _tid=0, PyThreadState* _tstate=NULL)
 
     wxPyThreadState(unsigned long _tid=0, PyThreadState* _tstate=NULL)

-        : tid(_tid), tstate(_tstate) {}
+        : tid(_tid), tstate(_tstate), blocked(1) {}

 };
 
 #include <wx/dynarray.h>
 };
 
 #include <wx/dynarray.h>


@@ -895,21 +900,21 @@ unsigned long wxPyGetCurrentThreadId() {
     return wxThread::GetCurrentId();
 }
 
     return wxThread::GetCurrentId();
 }
 

-static PyThreadState* gs_shutdownTState;
+static wxPyThreadState gs_shutdownTState;

 
 static
 
 static

-PyThreadState* wxPyGetThreadState() {
+wxPyThreadState* wxPyGetThreadState() {

     if (wxPyTMutex == NULL) // Python is shutting down...
     if (wxPyTMutex == NULL) // Python is shutting down...

-        return gs_shutdownTState;
+        return &gs_shutdownTState;

 
     unsigned long ctid = wxPyGetCurrentThreadId();
 
     unsigned long ctid = wxPyGetCurrentThreadId();

-    PyThreadState* tstate = NULL;
+    wxPyThreadState* tstate = NULL;

 
     wxPyTMutex->Lock();
     for(size_t i=0; i < wxPyTStates->GetCount(); i++) {
         wxPyThreadState& info = wxPyTStates->Item(i);
         if (info.tid == ctid) {
 
     wxPyTMutex->Lock();
     for(size_t i=0; i < wxPyTStates->GetCount(); i++) {
         wxPyThreadState& info = wxPyTStates->Item(i);
         if (info.tid == ctid) {

-            tstate = info.tstate;
+            tstate = &info;

             break;
         }
     }
             break;
         }
     }


@@ -918,10 +923,11 @@ PyThreadState* wxPyGetThreadState() {
     return tstate;
 }
 
     return tstate;
 }
 

+

 static
 void wxPySaveThreadState(PyThreadState* tstate) {
     if (wxPyTMutex == NULL) { // Python is shutting down, assume a single thread...
 static
 void wxPySaveThreadState(PyThreadState* tstate) {
     if (wxPyTMutex == NULL) { // Python is shutting down, assume a single thread...

-        gs_shutdownTState = tstate;
+        gs_shutdownTState.tstate = tstate;

         return;
     }
     unsigned long ctid = wxPyGetCurrentThreadId();
         return;
     }
     unsigned long ctid = wxPyGetCurrentThreadId();


@@ -950,6 +956,7 @@ void wxPySaveThreadState(PyThreadState* tstate) {
 #endif
 
 
 #endif
 
 

+

 // Calls from Python to wxWindows code are wrapped in calls to these
 // functions:
 
 // Calls from Python to wxWindows code are wrapped in calls to these
 // functions:
 


@@ -957,6 +964,7 @@ PyThreadState* wxPyBeginAllowThreads() {
 #ifdef WXP_WITH_THREAD
     PyThreadState* saved = PyEval_SaveThread();  // Py_BEGIN_ALLOW_THREADS;
     wxPySaveThreadState(saved);
 #ifdef WXP_WITH_THREAD
     PyThreadState* saved = PyEval_SaveThread();  // Py_BEGIN_ALLOW_THREADS;
     wxPySaveThreadState(saved);

+    wxPyGetThreadState()->blocked -= 1;

     return saved;
 #else
     return NULL;
     return saved;
 #else
     return NULL;


@@ -965,6 +973,7 @@ PyThreadState* wxPyBeginAllowThreads() {
 
 void wxPyEndAllowThreads(PyThreadState* saved) {
 #ifdef WXP_WITH_THREAD
 
 void wxPyEndAllowThreads(PyThreadState* saved) {
 #ifdef WXP_WITH_THREAD

+    wxPyGetThreadState()->blocked += 1;

     PyEval_RestoreThread(saved);   // Py_END_ALLOW_THREADS;
 #endif
 }
     PyEval_RestoreThread(saved);   // Py_END_ALLOW_THREADS;
 #endif
 }


@@ -976,17 +985,21 @@ void wxPyEndAllowThreads(PyThreadState* saved) {
 
 void wxPyBeginBlockThreads() {
 #ifdef WXP_WITH_THREAD
 
 void wxPyBeginBlockThreads() {
 #ifdef WXP_WITH_THREAD

-    PyThreadState* tstate = wxPyGetThreadState();
-    PyEval_RestoreThread(tstate);
+    wxPyThreadState* tstate = wxPyGetThreadState();
+    if (tstate->blocked++ == 0) {  // if nested calls then do nothing
+        PyEval_RestoreThread(tstate->tstate);
+    }

 #endif
 }
 
 
 void wxPyEndBlockThreads() {
 #ifdef WXP_WITH_THREAD
 #endif
 }
 
 
 void wxPyEndBlockThreads() {
 #ifdef WXP_WITH_THREAD

-    // Is there any need to save it again?
-    // PyThreadState* tstate =
-    PyEval_SaveThread();
+    wxPyThreadState* tstate = wxPyGetThreadState();
+    tstate->blocked -= 1;
+    if ( tstate->blocked == 0) {  // if nested calls then do nothing
+        PyEval_SaveThread();
+    }

 #endif
 }
 
 #endif
 }
 


@@ -1279,9 +1292,8 @@ off_t wxPyCBInputStream::OnSysTell() const {
         if (PyLong_Check(result))
             o = PyLong_AsLongLong(result);
         else
         if (PyLong_Check(result))
             o = PyLong_AsLongLong(result);
         else

-#else
-        o = PyInt_AsLong(result);

 #endif
 #endif

+            o = PyInt_AsLong(result);

         Py_DECREF(result);
     };
     wxPyEndBlockThreads();
         Py_DECREF(result);
     };
     wxPyEndBlockThreads();


@@ -1336,31 +1348,34 @@ void wxPyCallback::EventThunker(wxEvent& event) {
         arg = wxPyConstructObject((void*)&event, className);
     }
 
         arg = wxPyConstructObject((void*)&event, className);
     }
 

-    // Call the event handler, passing the event object
-    tuple = PyTuple_New(1);
-    PyTuple_SET_ITEM(tuple, 0, arg);  // steals ref to arg
-    result = PyEval_CallObject(func, tuple);
-    if ( result ) {
-        Py_DECREF(result);   // result is ignored, but we still need to decref it
-        PyErr_Clear();       // Just in case...
-    } else {
+    if (!arg) {

         PyErr_Print();
         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", "");
+    } else {
+        // Call the event handler, passing the event object
+        tuple = PyTuple_New(1);
+        PyTuple_SET_ITEM(tuple, 0, arg);  // steals ref to arg
+        result = PyEval_CallObject(func, tuple);

         if ( result ) {
         if ( result ) {

-            event.Skip(PyInt_AsLong(result));
-            Py_DECREF(result);
+            Py_DECREF(result);   // result is ignored, but we still need to decref it
+            PyErr_Clear();       // Just in case...

         } else {
             PyErr_Print();
         }
         } else {
             PyErr_Print();
         }

-    }

 
 

-    Py_DECREF(tuple);
+        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();
 }
 


@@ -1656,10 +1671,11 @@ PyObject* wxPy_ConvertList(wxListBase* listbase) {
 //----------------------------------------------------------------------
 
 long wxPyGetWinHandle(wxWindow* win) {
 //----------------------------------------------------------------------
 
 long wxPyGetWinHandle(wxWindow* win) {

+

 #ifdef __WXMSW__
     return (long)win->GetHandle();
 #endif
 #ifdef __WXMSW__
     return (long)win->GetHandle();
 #endif

-
+    

     // Find and return the actual X-Window.
 #ifdef __WXGTK__
     if (win->m_wxwindow) {
     // Find and return the actual X-Window.
 #ifdef __WXGTK__
     if (win->m_wxwindow) {


@@ -1673,6 +1689,11 @@ long wxPyGetWinHandle(wxWindow* win) {
 #endif
     }
 #endif
 #endif
     }
 #endif

+    
+#ifdef __WXMAC__
+    return (long)MAC_WXHWND(win->MacGetRootWindow());
+#endif
+    

     return 0;
 }
 
     return 0;
 }
 


@@ -2207,12 +2228,20 @@ bool wxPySimple_typecheck(PyObject* source, const wxChar* classname, int seqLen)
 
 bool wxSize_helper(PyObject* source, wxSize** obj)
 {
 
 bool wxSize_helper(PyObject* source, wxSize** obj)
 {

+    if (source == Py_None) {
+        **obj = wxSize(-1,-1);
+        return True;
+    }

     return wxPyTwoIntItem_helper(source, obj, wxT("wxSize"));
 }
 
 
 bool wxPoint_helper(PyObject* source, wxPoint** obj)
 {
     return wxPyTwoIntItem_helper(source, obj, wxT("wxSize"));
 }
 
 
 bool wxPoint_helper(PyObject* source, wxPoint** obj)
 {

+    if (source == Py_None) {
+        **obj = wxPoint(-1,-1);
+        return True;
+    }

     return wxPyTwoIntItem_helper(source, obj, wxT("wxPoint"));
 }
 
     return wxPyTwoIntItem_helper(source, obj, wxT("wxPoint"));
 }
 


@@ -2220,6 +2249,11 @@ bool wxPoint_helper(PyObject* source, wxPoint** obj)
 
 bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj) {
 
 
 bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj) {
 

+    if (source == Py_None) {
+        **obj = wxRealPoint(-1,-1);
+        return True;
+    }
+    

     // If source is an object instance then it may already be the right type
     if (wxPySwigInstance_Check(source)) {
         wxRealPoint* ptr;
     // If source is an object instance then it may already be the right type
     if (wxPySwigInstance_Check(source)) {
         wxRealPoint* ptr;


@@ -2252,6 +2286,11 @@ bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj) {
 
 bool wxRect_helper(PyObject* source, wxRect** obj) {
 
 
 bool wxRect_helper(PyObject* source, wxRect** obj) {
 

+    if (source == Py_None) {
+        **obj = wxRect(-1,-1,-1,-1);
+        return True;
+    }
+

     // If source is an object instance then it may already be the right type
     if (wxPySwigInstance_Check(source)) {
         wxRect* ptr;
     // If source is an object instance then it may already be the right type
     if (wxPySwigInstance_Check(source)) {
         wxRect* ptr;


@@ -2292,6 +2331,11 @@ bool wxRect_helper(PyObject* source, wxRect** obj) {
 
 bool wxColour_helper(PyObject* source, wxColour** obj) {
 
 
 bool wxColour_helper(PyObject* source, wxColour** obj) {
 

+    if (source == Py_None) {
+        **obj = wxNullColour;
+        return True;
+    }
+

     // If source is an object instance then it may already be the right type
     if (wxPySwigInstance_Check(source)) {
         wxColour* ptr;
     // If source is an object instance then it may already be the right type
     if (wxPySwigInstance_Check(source)) {
         wxColour* ptr;


@@ -2357,6 +2401,12 @@ bool wxColour_typecheck(PyObject* source) {
 
 
 bool wxPoint2D_helper(PyObject* source, wxPoint2D** obj) {
 
 
 bool wxPoint2D_helper(PyObject* source, wxPoint2D** obj) {

+
+    if (source == Py_None) {
+        **obj = wxPoint2D(-1,-1);
+        return True;
+    }
+    

     // If source is an object instance then it may already be the right type
     if (wxPySwigInstance_Check(source)) {
         wxPoint2D* ptr;
     // If source is an object instance then it may already be the right type
     if (wxPySwigInstance_Check(source)) {
         wxPoint2D* ptr;