Removed calls to wx.InitAllImageHandlers.

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

diff --git a/wxPython/src/_log.i b/wxPython/src/_log.i
index 0664712ee7442bff71fbae289f4cd9cc80218e7d..96214b20f63b9df17ff4e76dddbce8afee7944a3 100644 (file)
--- a/wxPython/src/_log.i
+++ b/wxPython/src/_log.i
@@ -218,8 +218,9 @@ void wxLogStatus(const wxString& msg);
 %name(LogStatusFrame)void wxLogStatus(wxFrame *pFrame, const wxString& msg);
 void wxLogSysError(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);
 
 
 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;
 
     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);
         }
         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;
         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);
         }
         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);
     }
         if (! found)
             wxLog::DoLogString(szString, t);
     }


@@ -280,7 +281,7 @@ public:
 // Now tell SWIG about it
 class wxPyLog : public wxLog {
 public:
 // Now tell SWIG about it
 class wxPyLog : public wxLog {
 public:

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

 
     wxPyLog();
     
 
     wxPyLog();