X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..3bcdbe527fde583072eefab67de8974c0e17a1e2:/wxPython/src/_log.i

diff --git a/wxPython/src/_log.i b/wxPython/src/_log.i
index 57ccf8c5b0..96214b20f6 100644
--- a/wxPython/src/_log.i
+++ b/wxPython/src/_log.i
@@ -61,7 +61,7 @@ public:
     static bool IsEnabled();
 
     // change the flag state, return the previous one
-    static bool EnableLogging(bool doIt = TRUE);
+    static bool EnableLogging(bool doIt = True);
 
     // static sink function
     static void OnLog(wxLogLevel level, const wxChar *szString, time_t t);    
@@ -94,7 +94,7 @@ public:
 
     // verbose mode is activated by standard command-line '-verbose'
     // option
-    static void SetVerbose(bool bVerbose = TRUE);
+    static void SetVerbose(bool bVerbose = True);
 
     // Set log level.  Log messages with level > logLevel will not be logged.
     static void SetLogLevel(wxLogLevel logLevel);
@@ -181,10 +181,10 @@ class wxLogWindow : public wxLog
 public:
     wxLogWindow(wxFrame *pParent,         // the parent frame (can be NULL)
             const wxString& szTitle,      // the title of the frame
-            bool bShow = TRUE,            // show window immediately?
-            bool bPassToOld = TRUE);      // pass log messages to the old target?
+            bool bShow = True,            // show window immediately?
+            bool bPassToOld = True);      // pass log messages to the old target?
 
-    void Show(bool bShow = TRUE);
+    void Show(bool bShow = True);
     wxFrame *GetFrame() const;
     wxLog *GetOldLog() const;
     bool IsPassingMessages() const;
@@ -218,8 +218,9 @@ void wxLogStatus(const wxString& msg);
 %name(LogStatusFrame)void wxLogStatus(wxFrame *pFrame, const wxString& msg);
 void wxLogSysError(const wxString& msg);
 
-void wxLogTrace(const wxString& msg);
-%name(LogTraceMask)void wxLogTrace(const wxString& mask, const wxString& msg);
+%nokwargs wxLogTrace;
+void wxLogTrace(unsigned long mask, const wxString& msg);
+void wxLogTrace(const wxString& mask, const wxString& msg);
 
 void wxLogGeneric(unsigned long level, const wxString& msg);
 
@@ -249,26 +250,26 @@ public:
 
     virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t) {
         bool found;
-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();
         if ((found = wxPyCBH_findCallback(m_myInst, "DoLog"))) {
             PyObject* s = wx2PyString(szString);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iOi)", level, s, t));
             Py_DECREF(s);
         }
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
         if (! found)
             wxLog::DoLog(level, szString, t);
     }
 
     virtual void DoLogString(const wxChar *szString, time_t t) {
         bool found;
-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();
         if ((found = wxPyCBH_findCallback(m_myInst, "DoLogString"))) {
             PyObject* s = wx2PyString(szString);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", s, t));
             Py_DECREF(s);
         }
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
         if (! found)
             wxLog::DoLogString(szString, t);
     }
@@ -280,7 +281,7 @@ public:
 // Now tell SWIG about it
 class wxPyLog : public wxLog {
 public:
-    %addtofunc wxPyLog   "self._setCallbackInfo(self, PyLog)"
+    %pythonAppend wxPyLog   "self._setCallbackInfo(self, PyLog)"
 
     wxPyLog();