fixed deadlock when calling wxPostEvent() from worker thread

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

diff --git a/wxPython/src/_log.i b/wxPython/src/_log.i
index f02bf3c39cd67566fbefb80ac6a422f1aa0a9679..b9204ea80e7cbd1683babab90401d6b9c6f0f80a 100644 (file)
--- a/wxPython/src/_log.i
+++ b/wxPython/src/_log.i
@@ -159,7 +159,7 @@ public:
         }
     }
 
-    %pythonAppend Destroy "args[0].thisown = 0";
+    %pythonPrepend Destroy "args[0].this.own(False)";
     %extend { void Destroy() { delete self; } }
 };
 
@@ -200,6 +200,9 @@ public:
     wxLog *GetOldLog() const;
     bool IsPassingMessages() const;
     void PassMessages(bool bDoPass);
+    
+    %property(Frame, GetFrame, doc="See `GetFrame`");
+    %property(OldLog, GetOldLog, doc="See `GetOldLog`");
 };
 
 
@@ -211,6 +214,8 @@ public:
     void PassMessages(bool bDoPass);
     bool IsPassingMessages();
     wxLog *GetOldLog();
+
+    %property(OldLog, GetOldLog, doc="See `GetOldLog`");    
 };
 
 // log everything to a buffer
@@ -220,11 +225,13 @@ public:
     wxLogBuffer();
 
     // get the string contents with all messages logged
-    const wxString& GetBuffer() const { return m_str; }
+    const wxString& GetBuffer() const;
 
     // show the buffer contents to the user in the best possible way (this uses
     // wxMessageOutputMessageBox) and clear it
     virtual void Flush();
+
+    %property(Buffer, GetBuffer, doc="See `GetBuffer`");    
 };
 
 
@@ -404,7 +411,7 @@ IMP_PYCALLBACK_VOID_(wxPyLog, wxLog, Flush);
 // Now tell SWIG about it
 class wxPyLog : public wxLog {
 public:
-    %pythonAppend wxPyLog   "self._setCallbackInfo(self, PyLog)"
+    %pythonAppend wxPyLog  setCallbackInfo(PyLog)
 
     wxPyLog();