X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da32eb53cbe7947f3f4599d7b6b5caa21a68d27f..d0ee33f5c6908b4ac5e1364381f0ef00942e3936:/wxPython/src/_mimetype.i diff --git a/wxPython/src/_mimetype.i b/wxPython/src/_mimetype.i index de52e6af84..87b01295ec 100644 --- 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,10 +190,10 @@ public: iconIndex = loc.GetIndex(); #endif // Make a tuple and put the values in it - bool blocked = 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(blocked); @@ -250,7 +250,7 @@ public: wxArrayString commands; if (self->GetAllCommands(&verbs, &commands, wxFileType::MessageParameters(filename, mimetype))) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyObject* tuple = PyTuple_New(2); PyTuple_SetItem(tuple, 0, wxArrayString2PyList_helper(verbs)); PyTuple_SetItem(tuple, 1, wxArrayString2PyList_helper(commands)); @@ -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); @@ -343,7 +343,7 @@ public: wxFileType *GetFileTypeFromMimeType(const wxString& mimeType); // other operations: return True if there were no errors or False if there - // were some unreckognized entries (the good entries are always read anyhow) + // were some unrecognized entries (the good entries are always read anyhow) // // read in additional file (the standard ones are read automatically) @@ -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);