warning fix

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

diff --git a/wxPython/src/drawlist.cpp b/wxPython/src/drawlist.cpp
index 724359e98af0cafc4c0535551aae9fa448804218..3764618895971024d6f7f688ee7dd7192aa0eef8 100644 (file)
--- a/wxPython/src/drawlist.cpp
+++ b/wxPython/src/drawlist.cpp
@@ -150,10 +150,10 @@ bool wxPyDrawXXXPoint(wxDC& dc, PyObject* coords)
 
     if (! wxPy2int_seq_helper(coords, &x, &y)) {
         PyErr_SetString(PyExc_TypeError, "Expected a sequence of (x,y) sequences.");
 
     if (! wxPy2int_seq_helper(coords, &x, &y)) {
         PyErr_SetString(PyExc_TypeError, "Expected a sequence of (x,y) sequences.");

-        return False;
+        return false;

     }
     dc.DrawPoint(x, y);
     }
     dc.DrawPoint(x, y);

-    return True;
+    return true;

 }
 
 bool wxPyDrawXXXLine(wxDC& dc, PyObject* coords)
 }
 
 bool wxPyDrawXXXLine(wxDC& dc, PyObject* coords)


@@ -162,10 +162,10 @@ bool wxPyDrawXXXLine(wxDC& dc, PyObject* coords)
 
     if (! wxPy4int_seq_helper(coords, &x1, &y1, &x2, &y2)) {
         PyErr_SetString(PyExc_TypeError, "Expected a sequence of (x1,y1, x1,y2) sequences.");
 
     if (! wxPy4int_seq_helper(coords, &x1, &y1, &x2, &y2)) {
         PyErr_SetString(PyExc_TypeError, "Expected a sequence of (x1,y1, x1,y2) sequences.");

-        return False;
+        return false;

     }
     dc.DrawLine(x1,y1, x2,y2);
     }
     dc.DrawLine(x1,y1, x2,y2);

-    return True;
+    return true;

 }
 
 bool wxPyDrawXXXRectangle(wxDC& dc, PyObject* coords)
 }
 
 bool wxPyDrawXXXRectangle(wxDC& dc, PyObject* coords)


@@ -174,10 +174,10 @@ bool wxPyDrawXXXRectangle(wxDC& dc, PyObject* coords)
 
     if (! wxPy4int_seq_helper(coords, &x, &y, &w, &h)) {
         PyErr_SetString(PyExc_TypeError, "Expected a sequence of (x,y, w,h) sequences.");
 
     if (! wxPy4int_seq_helper(coords, &x, &y, &w, &h)) {
         PyErr_SetString(PyExc_TypeError, "Expected a sequence of (x,y, w,h) sequences.");

-        return False;
+        return false;

     }
     dc.DrawRectangle(x, y, w, h);
     }
     dc.DrawRectangle(x, y, w, h);

-    return True;
+    return true;

 }
 
 bool wxPyDrawXXXEllipse(wxDC& dc, PyObject* coords)
 }
 
 bool wxPyDrawXXXEllipse(wxDC& dc, PyObject* coords)


@@ -186,10 +186,10 @@ bool wxPyDrawXXXEllipse(wxDC& dc, PyObject* coords)
 
     if (! wxPy4int_seq_helper(coords, &x, &y, &w, &h)) {
         PyErr_SetString(PyExc_TypeError, "Expected a sequence of (x,y, w,h) sequences.");
 
     if (! wxPy4int_seq_helper(coords, &x, &y, &w, &h)) {
         PyErr_SetString(PyExc_TypeError, "Expected a sequence of (x,y, w,h) sequences.");

-        return False;
+        return false;

     }
     dc.DrawEllipse(x, y, w, h);
     }
     dc.DrawEllipse(x, y, w, h);

-    return True;
+    return true;

 }
 
 
 }
 
 


@@ -201,10 +201,11 @@ bool wxPyDrawXXXPolygon(wxDC& dc, PyObject* coords)
     points = wxPoint_LIST_helper(coords, &numPoints);
     if (! points) {
         PyErr_SetString(PyExc_TypeError, "Expected a sequence of sequences of (x,y) sequences.");
     points = wxPoint_LIST_helper(coords, &numPoints);
     if (! points) {
         PyErr_SetString(PyExc_TypeError, "Expected a sequence of sequences of (x,y) sequences.");

-        return False;
+        return false;

     }
     dc.DrawPolygon(numPoints, points);
     }
     dc.DrawPolygon(numPoints, points);

-    return True;
+    delete [] points;
+    return true;

 }
 
 
 }
 
 


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

-            if (! PyString_Check(obj) ) {
+            if (! PyString_Check(obj) && !PyUnicode_Check(obj) ) {

                 Py_DECREF(obj);
                 goto err1;
             }
                 Py_DECREF(obj);
                 goto err1;
             }