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 3d52bf3a7dc1e667923187299d059348fe6e96f2..b9204ea80e7cbd1683babab90401d6b9c6f0f80a 100644 (file)
--- a/wxPython/src/_log.i
+++ b/wxPython/src/_log.i
@@ -106,6 +106,13 @@ public:
     // current is NULL?
     static void DontCreateOnDemand();
 
     // current is NULL?
     static void DontCreateOnDemand();
 

+    // log the count of repeating messages instead of logging the messages
+    // multiple times
+    static void SetRepetitionCounting(bool bRepetCounting = true);
+
+    // gets duplicate counting status
+    static bool GetRepetitionCounting();
+

     // trace mask (see wxTraceXXX constants for details)
     static void SetTraceMask(wxTraceMask ulMask);
 
     // trace mask (see wxTraceXXX constants for details)
     static void SetTraceMask(wxTraceMask ulMask);
 


@@ -152,11 +159,8 @@ public:
         }
     }
 
         }
     }
 

-    %pythonAppend Destroy "args[0].thisown = 0";
+    %pythonPrepend Destroy "args[0].this.own(False)";

     %extend { void Destroy() { delete self; } }
     %extend { void Destroy() { delete self; } }

-
-    void DoLog(wxLogLevel level, const wxChar *szString, long t);
-    void DoLogString(const wxChar *szString, long t);

 };
 
 
 };
 
 


@@ -196,6 +200,9 @@ public:
     wxLog *GetOldLog() const;
     bool IsPassingMessages() const;
     void PassMessages(bool bDoPass);
     wxLog *GetOldLog() const;
     bool IsPassingMessages() const;
     void PassMessages(bool bDoPass);

+    
+    %property(Frame, GetFrame, doc="See `GetFrame`");
+    %property(OldLog, GetOldLog, doc="See `GetOldLog`");

 };
 
 
 };
 
 


@@ -207,6 +214,8 @@ public:
     void PassMessages(bool bDoPass);
     bool IsPassingMessages();
     wxLog *GetOldLog();
     void PassMessages(bool bDoPass);
     bool IsPassingMessages();
     wxLog *GetOldLog();

+
+    %property(OldLog, GetOldLog, doc="See `GetOldLog`");    

 };
 
 // log everything to a buffer
 };
 
 // log everything to a buffer


@@ -216,11 +225,13 @@ public:
     wxLogBuffer();
 
     // get the string contents with all messages logged
     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();
 
     // 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`");    

 };
 
 
 };
 
 


@@ -400,7 +411,7 @@ IMP_PYCALLBACK_VOID_(wxPyLog, wxLog, Flush);
 // Now tell SWIG about it
 class wxPyLog : public wxLog {
 public:
 // Now tell SWIG about it
 class wxPyLog : public wxLog {
 public:

-    %pythonAppend wxPyLog   "self._setCallbackInfo(self, PyLog)"
+    %pythonAppend wxPyLog  setCallbackInfo(PyLog)

 
     wxPyLog();
     
 
     wxPyLog();