3 parameter wx.ImageList.Replace is now available everywhere

[wxWidgets.git] / wxPython / src / _pen.i

diff --git a/wxPython/src/_pen.i b/wxPython/src/_pen.i
index cf9d76b28c111c647fb7cf96398c08929d233abf..e0fca1cb17ca0907d1ff6b6cc25cb7cd3ac1a8d1 100644 (file)
--- a/wxPython/src/_pen.i
+++ b/wxPython/src/_pen.i
@@ -29,6 +29,8 @@
 %newgroup
 
 
+MustHaveApp(wxPen);
+
 class wxPen : public wxGDIObject {
 public:
     wxPen(wxColour& colour, int width=1, int style=wxSOLID);
@@ -54,7 +56,7 @@ public:
         PyObject* GetDashes() {
             wxDash* dashes;
             int count = self->GetDashes(&dashes);
-            bool blocked = wxPyBeginBlockThreads();
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
             PyObject* retval = PyList_New(0);
             for (int x=0; x<count; x++) {
                 PyObject* pyint = PyInt_FromLong(dashes[x]);
@@ -66,7 +68,7 @@ public:
         }
 
         void _SetDashes(PyObject* _self, PyObject* pyDashes) {
-            bool blocked = wxPyBeginBlockThreads();
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
             int size = PyList_Size(pyDashes);
             wxDash* dashes = (wxDash*)byte_LIST_helper(pyDashes);
 
@@ -105,8 +107,8 @@ public:
 
     
     %extend {
-        bool __eq__(const wxPen* other) { return other ? (*self == *other) : False; }
-        bool __ne__(const wxPen* other) { return other ? (*self != *other) : True;  }
+        bool __eq__(const wxPen* other) { return other ? (*self == *other) : false; }
+        bool __ne__(const wxPen* other) { return other ? (*self != *other) : true;  }
     }
     %pythoncode { def __nonzero__(self): return self.Ok() }
 };