ComputeScaleAndOrigin not protected anymore

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

diff --git a/wxPython/src/_config.i b/wxPython/src/_config.i
index 4ee0060a0f60af788f600583b714a52b4aa4f8f2..1c8b100ff3c3357d6cca9bd8f22e92ef7d640721 100644 (file)
--- a/wxPython/src/_config.i
+++ b/wxPython/src/_config.i
@@ -24,12 +24,14 @@
 
 %{
     static PyObject* __EnumerationHelper(bool flag, wxString& str, long index) {
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
         PyObject* ret = PyTuple_New(3);
         if (ret) {
             PyTuple_SET_ITEM(ret, 0, PyInt_FromLong(flag));
            PyTuple_SET_ITEM(ret, 1, wx2PyString(str));
             PyTuple_SET_ITEM(ret, 2, PyInt_FromLong(index));
         }
+        wxPyEndBlockThreads(blocked);
         return ret;
     }
 %}
@@ -85,12 +87,12 @@ public:
     };
 
 
-    %apply SWIGTYPE *DISOWN { wxConfigBase *config };
+    %disownarg( wxConfigBase *config );
     DocDeclStr(
         static wxConfigBase *, Set(wxConfigBase *config),
         "Sets the global config object (the one returned by Get) and returns a
 reference to the previous global config object.", "");
-    %clear wxConfigBase *config;
+    %cleardisown( wxConfigBase *config );
 
     DocDeclStr(
         static wxConfigBase *, Get(bool createOnDemand = true),