Use wmain() if supported by the compiler/CRT instead of main().

[wxWidgets.git] / include / wx / mimetype.h

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index f15a133dea643d4537d7d7fd4bc66e6438d8d5ef..0bffcb0fee8f269d64ba331a607b2e533f9d1551 100644 (file)
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -53,12 +53,12 @@ class WXDLLIMPEXP_BASE wxMimeType : public wxString
 public:
     // all string ctors here
 
 public:
     // all string ctors here
 

-    wxString GetType() const { return BeforeFirst(_T('/')); }
-    wxString GetSubType() const { return AfterFirst(_T('/')); }
+    wxString GetType() const { return BeforeFirst(wxT('/')); }
+    wxString GetSubType() const { return AfterFirst(wxT('/')); }

 
     void SetSubType(const wxString& subtype)
     {
 
     void SetSubType(const wxString& subtype)
     {

-        *this = GetType() + _T('/') + subtype;
+        *this = GetType() + wxT('/') + subtype;

     }
 
     bool Matches(const wxMimeType& wildcard)
     }
 
     bool Matches(const wxMimeType& wildcard)


@@ -137,14 +137,14 @@ public:
     // NB: This is a helper to get implicit conversion of variadic ctor's
     //     fixed arguments into something that can be passed to VarArgInit().
     //     Do not use, it's used by the ctor only.
     // NB: This is a helper to get implicit conversion of variadic ctor's
     //     fixed arguments into something that can be passed to VarArgInit().
     //     Do not use, it's used by the ctor only.

-    struct WXDLLIMPEXP_BASE CtorString
+    struct CtorString

     {
         CtorString(const char *str) : m_str(str) {}
         CtorString(const wchar_t *str) : m_str(str) {}
         CtorString(const wxString& str) : m_str(str) {}
         CtorString(const wxCStrData& str) : m_str(str) {}
     {
         CtorString(const char *str) : m_str(str) {}
         CtorString(const wchar_t *str) : m_str(str) {}
         CtorString(const wxString& str) : m_str(str) {}
         CtorString(const wxCStrData& str) : m_str(str) {}

-        CtorString(const wxCharBuffer& str) : m_str(str) {}
-        CtorString(const wxWCharBuffer& str) : m_str(str) {}
+        CtorString(const wxScopedCharBuffer& str) : m_str(str) {}
+        CtorString(const wxScopedWCharBuffer& str) : m_str(str) {}

 
         operator const wxString*() const { return &m_str; }
 
 
         operator const wxString*() const { return &m_str; }
 


@@ -152,8 +152,16 @@ public:
     };
 
     // ctors
     };
 
     // ctors

-        // a normal item

 
 

+    // Ctor specifying just the MIME type (which is mandatory), the other
+    // fields can be set later if needed.
+    wxFileTypeInfo(const wxString& mimeType)
+        : m_mimeType(mimeType)
+    {
+    }
+
+    // Ctor allowing to specify the values of all fields at once:
+    //

     // wxFileTypeInfo(const wxString& mimeType,
     //               const wxString& openCmd,
     //               const wxString& printCmd,
     // wxFileTypeInfo(const wxString& mimeType,
     //               const wxString& openCmd,
     //               const wxString& printCmd,


@@ -224,6 +232,16 @@ public:
     bool IsValid() const { return !m_mimeType.empty(); }
 
     // setters
     bool IsValid() const { return !m_mimeType.empty(); }
 
     // setters

+        // set the open/print commands
+    void SetOpenCommand(const wxString& command) { m_openCmd = command; }
+    void SetPrintCommand(const wxString& command) { m_printCmd = command; }
+
+        // set the description
+    void SetDescription(const wxString& desc) { m_desc = desc; }
+
+        // add another extension corresponding to this file type
+    void AddExtension(const wxString& ext) { m_exts.push_back(ext); }
+

         // set the icon info
     void SetIcon(const wxString& iconFile, int iconIndex = 0)
     {
         // set the icon info
     void SetIcon(const wxString& iconFile, int iconIndex = 0)
     {


@@ -371,7 +389,7 @@ public:
 
     // operations
         // expand a string in the format of GetOpenCommand (which may contain
 
     // operations
         // expand a string in the format of GetOpenCommand (which may contain

-        // '%s' and '%t' format specificators for the file name and mime type
+        // '%s' and '%t' format specifiers for the file name and mime type

         // and %{param} constructions).
     static wxString ExpandCommand(const wxString& command,
                                   const MessageParameters& params);
         // and %{param} constructions).
     static wxString ExpandCommand(const wxString& command,
                                   const MessageParameters& params);


@@ -410,7 +428,7 @@ public:
 
     static void Set( wxMimeTypesManagerFactory *factory );
     static wxMimeTypesManagerFactory *Get();
 
     static void Set( wxMimeTypesManagerFactory *factory );
     static wxMimeTypesManagerFactory *Get();

-    
+

 private:
     static wxMimeTypesManagerFactory *m_factory;
 };
 private:
     static wxMimeTypesManagerFactory *m_factory;
 };