fixed deadlock when calling wxPostEvent() from worker thread

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

diff --git a/wxPython/src/_pen.i b/wxPython/src/_pen.i
index 860f18c9870dee1df7350b884fc5d61aaaa3dd26..577c0a936e8bf35be4fa135b7a69a61a231bfca7 100644 (file)
--- a/wxPython/src/_pen.i
+++ b/wxPython/src/_pen.i
@@ -42,7 +42,8 @@ public:
     int GetStyle();
     int GetWidth();
 
     int GetStyle();
     int GetWidth();
 

-    bool Ok();
+    bool IsOk();
+    %pythoncode { Ok = IsOk }

 
     void SetCap(int cap_style);
     void SetColour(wxColour& colour);
 
     void SetCap(int cap_style);
     void SetColour(wxColour& colour);


@@ -56,7 +57,7 @@ public:
         PyObject* GetDashes() {
             wxDash* dashes;
             int count = self->GetDashes(&dashes);
         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]);
             PyObject* retval = PyList_New(0);
             for (int x=0; x<count; x++) {
                 PyObject* pyint = PyInt_FromLong(dashes[x]);


@@ -68,7 +69,7 @@ public:
         }
 
         void _SetDashes(PyObject* _self, PyObject* pyDashes) {
         }
 
         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);
 
             int size = PyList_Size(pyDashes);
             wxDash* dashes = (wxDash*)byte_LIST_helper(pyDashes);
 


@@ -98,11 +99,13 @@ public:
     
 #ifndef __WXMAC__
     int GetDashCount() const;
     
 #ifndef __WXMAC__
     int GetDashCount() const;

+    %property(DashCount, GetDashCount, doc="See `GetDashCount`");

 #endif
     
 #ifdef __WXMSW__
     wxBitmap* GetStipple();
     void SetStipple(wxBitmap& stipple);
 #endif
     
 #ifdef __WXMSW__
     wxBitmap* GetStipple();
     void SetStipple(wxBitmap& stipple);

+    %property(Stipple, GetStipple, SetStipple, doc="See `GetStipple` and `SetStipple`");

 #endif
 
     
 #endif
 
     


@@ -110,7 +113,14 @@ public:
         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() }
+    %pythoncode { def __nonzero__(self): return self.IsOk() }
+
+    %property(Cap, GetCap, SetCap, doc="See `GetCap` and `SetCap`");
+    %property(Colour, GetColour, SetColour, doc="See `GetColour` and `SetColour`");
+    %property(Dashes, GetDashes, SetDashes, doc="See `GetDashes` and `SetDashes`");
+    %property(Join, GetJoin, SetJoin, doc="See `GetJoin` and `SetJoin`");
+    %property(Style, GetStyle, SetStyle, doc="See `GetStyle` and `SetStyle`");
+    %property(Width, GetWidth, SetWidth, doc="See `GetWidth` and `SetWidth`");

 };
 
 
 };