corrected code to not suppose that Write() always writes all the data it was given

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

diff --git a/wxPython/src/drawlist.cpp b/wxPython/src/drawlist.cpp
index 0ec57b0ec5d5efb51bf622721466805173e6e422..724359e98af0cafc4c0535551aae9fa448804218 100644 (file)
--- a/wxPython/src/drawlist.cpp
+++ b/wxPython/src/drawlist.cpp
@@ -30,7 +30,7 @@ void wxPyDrawList_SetAPIPtr()
 PyObject* wxPyDrawXXXList(wxDC& dc, wxPyDrawListOp_t doDraw,
                           PyObject* pyCoords, PyObject* pyPens, PyObject* pyBrushes)
 {
 PyObject* wxPyDrawXXXList(wxDC& dc, wxPyDrawListOp_t doDraw,
                           PyObject* pyCoords, PyObject* pyPens, PyObject* pyBrushes)
 {

-    wxPyBeginBlockThreads(); 
+    bool blocked = wxPyBeginBlockThreads(); 

 
     bool      isFastSeq  = PyList_Check(pyCoords) || PyTuple_Check(pyCoords);
     bool      isFastPens = PyList_Check(pyPens) || PyTuple_Check(pyPens);
 
     bool      isFastSeq  = PyList_Check(pyCoords) || PyTuple_Check(pyCoords);
     bool      isFastPens = PyList_Check(pyPens) || PyTuple_Check(pyPens);


@@ -138,7 +138,7 @@ PyObject* wxPyDrawXXXList(wxDC& dc, wxPyDrawListOp_t doDraw,
 
 
  exit:
 
 
  exit:

-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);

     return retval;
 }
 
     return retval;
 }
 


@@ -214,7 +214,7 @@ bool wxPyDrawXXXPolygon(wxDC& dc, PyObject* coords)
 
 PyObject* wxPyDrawTextList(wxDC& dc, PyObject* textList, PyObject* pyPoints, PyObject* foregroundList, PyObject* backgroundList)
 {
 
 PyObject* wxPyDrawTextList(wxDC& dc, PyObject* textList, PyObject* pyPoints, PyObject* foregroundList, PyObject* backgroundList)
 {

-    wxPyBeginBlockThreads();
+    bool blocked = wxPyBeginBlockThreads();

 
     bool      isFastSeq  = PyList_Check(pyPoints) || PyTuple_Check(pyPoints);
     bool      isFastText = PyList_Check(textList) || PyTuple_Check(textList);
 
     bool      isFastSeq  = PyList_Check(pyPoints) || PyTuple_Check(pyPoints);
     bool      isFastText = PyList_Check(textList) || PyTuple_Check(textList);


@@ -274,7 +274,7 @@ PyObject* wxPyDrawTextList(wxDC& dc, PyObject* textList, PyObject* pyPoints, PyO
             else {
                 obj = PySequence_GetItem(foregroundList, i);
             }
             else {
                 obj = PySequence_GetItem(foregroundList, i);
             }

-            if (! wxPyConvertSwigPtr(obj, (void **) &color, wxT("wxColour_p"))) {
+            if (! wxPyConvertSwigPtr(obj, (void **) &color, wxT("wxColour"))) {

                 if (!isFastForeground)
                     Py_DECREF(obj);
                 goto err2;
                 if (!isFastForeground)
                     Py_DECREF(obj);
                 goto err2;


@@ -353,7 +353,7 @@ PyObject* wxPyDrawTextList(wxDC& dc, PyObject* textList, PyObject* pyPoints, PyO
     goto exit;
 
  exit:
     goto exit;
 
  exit:

-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);

     return retval;
 }
 
     return retval;
 }