better report if the subclass factory has import problems

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

diff --git a/wxPython/src/_mimetype.i b/wxPython/src/_mimetype.i
index 57bdcd4f8482ea58952d4cf81c6d8e46f4390eea..bd94363c6477e8e39047cd2f6d0fc161df8e10be 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
@@ -81,11 +81,21 @@ public:
 
     // get the array of all extensions
     const wxArrayString& GetExtensions() const;
-    int GetExtensionsCount() const;
+    size_t GetExtensionsCount() const;
 
     // get the icon info
     const wxString& GetIconFile() const;
     int GetIconIndex() const;
+    
+    %property(Description, GetDescription, doc="See `GetDescription`");
+    %property(Extensions, GetExtensions, doc="See `GetExtensions`");
+    %property(ExtensionsCount, GetExtensionsCount, doc="See `GetExtensionsCount`");
+    %property(IconFile, GetIconFile, doc="See `GetIconFile`");
+    %property(IconIndex, GetIconIndex, doc="See `GetIconIndex`");
+    %property(MimeType, GetMimeType, doc="See `GetMimeType`");
+    %property(OpenCommand, GetOpenCommand, doc="See `GetOpenCommand`");
+    %property(PrintCommand, GetPrintCommand, doc="See `GetPrintCommand`");
+    %property(ShortDesc, GetShortDesc, SetShortDesc, doc="See `GetShortDesc` and `SetShortDesc`");
 };
 
 
@@ -190,13 +200,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 +260,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
@@ -264,9 +274,9 @@ public:
 
 
     // set an arbitrary command, ask confirmation if it already exists and
-    // overwriteprompt is TRUE
+    // 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);
 
@@ -289,13 +299,21 @@ public:
         }
     }
 
+    %property(AllCommands, GetAllCommands, doc="See `GetAllCommands`");
+    %property(Description, GetDescription, doc="See `GetDescription`");
+    %property(Extensions, GetExtensions, doc="See `GetExtensions`");
+    %property(Icon, GetIcon, doc="See `GetIcon`");
+    %property(IconInfo, GetIconInfo, doc="See `GetIconInfo`");
+    %property(MimeType, GetMimeType, doc="See `GetMimeType`");
+    %property(MimeTypes, GetMimeTypes, doc="See `GetMimeTypes`");
+    %property(OpenCommand, GetOpenCommand, doc="See `GetOpenCommand`");
+    %property(PrintCommand, GetPrintCommand, doc="See `GetPrintCommand`");
 };
 
 
 
 //---------------------------------------------------------------------------
 
-// See also wxPy_ReinitStockObjects in helpers.cpp
 wxMimeTypesManager* const wxTheMimeTypesManager;
 
 
@@ -313,7 +331,7 @@ public:
         // check if the given MIME type is the same as the other one: the
         // second argument may contain wildcards ('*'), but not the first. If
         // the types are equal or if the mimeType matches wildcard the function
-        // returns TRUE, otherwise it returns FALSE
+        // returns True, otherwise it returns False
     static bool IsOfType(const wxString& mimeType, const wxString& wildcard);
 
     // ctor
@@ -342,18 +360,18 @@ public:
     %newobject GetFileTypeFromMimeType;
     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)
+    // other operations: return True if there were no errors or False if there
+    // were some unrecognized entries (the good entries are always read anyhow)
     //
 
     // read in additional file (the standard ones are read automatically)
     // in mailcap format (see mimetype.cpp for description)
     //
-    // 'fallback' parameter may be set to TRUE to avoid overriding the
+    // 'fallback' parameter may be set to True to avoid overriding the
     // 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);
+    // fallback == True this won't happen
+    bool ReadMailcap(const wxString& filename, bool fallback = false);
 
     // read in additional file in mime.types format
     bool ReadMimeTypes(const wxString& filename);
@@ -369,7 +387,7 @@ public:
 
     // these functions can be used to provide default values for some of the
     // MIME types inside the program itself (you may also use
-    // ReadMailcap(filenameWithDefaultTypes, TRUE /* use as fallback */) to
+    // ReadMailcap(filenameWithDefaultTypes, True /* use as fallback */) to
     // achieve the same goal, but this requires having this info in a file).
     //
     void AddFallback(const wxFileTypeInfo& ft);