minor fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/msw/misc2.cpp b/wxPython/src/msw/misc2.cpp
index 21631395cc410d9d6f6afd9b1525cbb7c4faa7ba..156e83a7e2df67951bbe2d2a3a2dce2b2c31be90 100644 (file)
--- a/wxPython/src/msw/misc2.cpp
+++ b/wxPython/src/msw/misc2.cpp
@@ -239,14 +239,14 @@ class wxWave : public wxObject
 {
 public:
     wxWave(const wxString& fileName, bool isResource = FALSE) {
 {
 public:
     wxWave(const wxString& fileName, bool isResource = FALSE) {

-        bool doSave = wxPyRestoreThread();
+        wxPyTState* state = wxPyBeginBlockThreads();

         PyErr_SetString(PyExc_NotImplementedError, "wxWave is not available on this platform.");
         PyErr_SetString(PyExc_NotImplementedError, "wxWave is not available on this platform.");

-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads(state);

     }
     wxWave(int size, const wxByte* data) {
     }
     wxWave(int size, const wxByte* data) {

-        bool doSave = wxPyRestoreThread();
+        wxPyTState* state = wxPyBeginBlockThreads();

         PyErr_SetString(PyExc_NotImplementedError, "wxWave is not available on this platform.");
         PyErr_SetString(PyExc_NotImplementedError, "wxWave is not available on this platform.");

-        wxPySaveThread(doSave);
+        wxPyEndBlockThreads(state);

     }
 
     ~wxWave() {}
     }
 
     ~wxWave() {}

diff --git a/wxPython/wxPython/lib/activexwrapper.py b/wxPython/wxPython/lib/activexwrapper.py
index 479203e9bc1748528efadd9f56cd3c79faa11cbd..d7dde4bbda3f7d7a39a53bc28ce96a6597243ce4 100644 (file)
--- a/wxPython/wxPython/lib/activexwrapper.py
+++ b/wxPython/wxPython/lib/activexwrapper.py
@@ -130,7 +130,7 @@ def axw_OEB(self, event):
 
 
 def axw_Cleanup(self):
 
 
 def axw_Cleanup(self):

-    #del self._wnd
+    del self._wnd

     self.close()
     ## anything else???
 
     self.close()
     ## anything else???