Oops

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

diff --git a/wxPython/src/_mimetype.i b/wxPython/src/_mimetype.i
index 4dbe41f1f2777f2b5474cdfd938e1515f9d67f2e..6d84f3bca8db4a275d03924d038e195f6cf85161 100644 (file)
--- a/wxPython/src/_mimetype.i
+++ b/wxPython/src/_mimetype.i
@@ -48,11 +48,11 @@ public:
 
     // the array elements correspond to the parameters of the ctor above in
     // the same order
-    %name(FileTypeInfoSequence)wxFileTypeInfo(const wxArrayString& sArray);
+    %Rename(FileTypeInfoSequence,, wxFileTypeInfo(const wxArrayString& sArray));
 
     // invalid item - use this to terminate the array passed to
     // wxMimeTypesManager::AddFallbacks
-    %name(NullFileTypeInfo)wxFileTypeInfo();
+    %Rename(NullFileTypeInfo,, wxFileTypeInfo());
 
 
     // test if this object can be used
@@ -190,13 +190,13 @@ public:
                 iconIndex = loc.GetIndex();
 #endif
                 // Make a tuple and put the values in it
-                wxPyBeginBlockThreads();
+                wxPyBlock_t blocked = wxPyBeginBlockThreads();
                 PyObject* tuple = PyTuple_New(3);
                 PyTuple_SetItem(tuple, 0, wxPyConstructObject(new wxIcon(loc),
-                                                              wxT("wxIcon"), True));
+                                                              wxT("wxIcon"), true));
                 PyTuple_SetItem(tuple, 1, wx2PyString(iconFile));
                 PyTuple_SetItem(tuple, 2, PyInt_FromLong(iconIndex));
-                wxPyEndBlockThreads();
+                wxPyEndBlockThreads(blocked);
                 return tuple;
             }
             else
@@ -250,11 +250,11 @@ public:
             wxArrayString commands;
             if (self->GetAllCommands(&verbs, &commands,
                                      wxFileType::MessageParameters(filename, mimetype))) {
-                wxPyBeginBlockThreads();
+                wxPyBlock_t blocked = wxPyBeginBlockThreads();
                 PyObject* tuple = PyTuple_New(2);
                 PyTuple_SetItem(tuple, 0, wxArrayString2PyList_helper(verbs));
                 PyTuple_SetItem(tuple, 1, wxArrayString2PyList_helper(commands));
-                wxPyEndBlockThreads();
+                wxPyEndBlockThreads(blocked);
                 return tuple;
             }
             else
@@ -266,7 +266,7 @@ public:
     // set an arbitrary command, ask confirmation if it already exists and
     // overwriteprompt is True
     bool SetCommand(const wxString& cmd, const wxString& verb,
-                    bool overwriteprompt = True);
+                    bool overwriteprompt = true);
 
     bool SetDefaultIcon(const wxString& cmd = wxPyEmptyString, int index = 0);
 
@@ -353,7 +353,7 @@ public:
     // settings from other, previously parsed, files by this one: normally,
     // the files read most recently would override the older files, but with
     // fallback == True this won't happen
-    bool ReadMailcap(const wxString& filename, bool fallback = False);
+    bool ReadMailcap(const wxString& filename, bool fallback = false);
 
     // read in additional file in mime.types format
     bool ReadMimeTypes(const wxString& filename);