assert that wxRound() argument is in the supported range

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

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index 5265a82abd3d795bcf223c4bf6a494a0677d1bfe..2a38d413ca25f868dedff8fa841cbd76c5889049 100644 (file)
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -82,20 +82,7 @@ public:
     }
 
     // add a new verb with the command or replace the old value
-    void AddOrReplaceVerb(const wxString& verb, const wxString& cmd)
-    {
-        int n = m_verbs.Index(verb, false /* ignore case */);
-        if ( n == wxNOT_FOUND )
-        {
-            m_verbs.Add(verb);
-            m_commands.Add(cmd);
-        }
-        else
-        {
-            m_commands[n] = cmd;
-        }
-    }
-
+    void AddOrReplaceVerb(const wxString& verb, const wxString& cmd);
     void Add(const wxString& s)
     {
         m_verbs.Add(s.BeforeFirst(wxT('=')));
@@ -110,31 +97,11 @@ public:
     bool HasVerb(const wxString& verb) const
         { return m_verbs.Index(verb) != wxNOT_FOUND; }
 
-    wxString GetCommandForVerb(const wxString& verb, size_t *idx = NULL) const
-    {
-        wxString s;
-
-        int n = m_verbs.Index(verb);
-        if ( n != wxNOT_FOUND )
-        {
-            s = m_commands[(size_t)n];
-            if ( idx )
-                *idx = n;
-        }
-        else if ( idx )
-        {
-            // different from any valid index
-            *idx = (size_t)-1;
-        }
-
-        return s;
-    }
+    // returns empty string and wxNOT_FOUND in idx if no such verb
+    wxString GetCommandForVerb(const wxString& verb, size_t *idx = NULL) const;
 
     // get a "verb=command" string
-    wxString GetVerbCmd(size_t n) const
-    {
-        return m_verbs[n] + wxT('=') + m_commands[n];
-    }
+    wxString GetVerbCmd(size_t n) const;
 
 private:
     wxArrayString m_verbs;
@@ -149,16 +116,44 @@ private:
 
 class WXDLLIMPEXP_BASE wxFileTypeInfo
 {
+private:
+    void VarArgInit(const wxString& mimeType,
+                    const wxString& openCmd,
+                    const wxString& printCmd,
+                    const wxString& desc,
+                    // the other parameters form a NULL terminated list of
+                    // extensions
+                    ...);
 public:
     // ctors
         // a normal item
-    wxFileTypeInfo(const wxChar *mimeType,
-                   const wxChar *openCmd,
-                   const wxChar *printCmd,
-                   const wxChar *desc,
-                   // the other parameters form a NULL terminated list of
-                   // extensions
-                   ...);
+
+    // wxFileTypeInfo(const wxString& mimeType,
+    //               const wxString& openCmd,
+    //               const wxString& printCmd,
+    //               const wxString& desc,
+    //               // the other parameters form a NULL terminated list of
+    //               // extensions
+    //               ...);
+    WX_DEFINE_VARARG_FUNC_CTOR(wxFileTypeInfo,
+                               4, (const wxString&, const wxString&,
+                                   const wxString&, const wxString&),
+                               VarArgInit)
+#ifdef __WATCOMC__
+    // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
+    WX_DEFINE_VARARG_FUNC_CTOR(wxFileTypeInfo,
+                               4, (const char*, const char*,
+                                   const char*, const char*),
+                               VarArgInit)
+    WX_DEFINE_VARARG_FUNC_CTOR(wxFileTypeInfo,
+                               4, (const wchar_t*, const wchar_t*,
+                                   const wchar_t*, const wchar_t*),
+                               VarArgInit)
+    WX_DEFINE_VARARG_FUNC_CTOR(wxFileTypeInfo,
+                               4, (const wxCStrData&, const wxCStrData&,
+                                   const wxCStrData&, const wxCStrData&),
+                               VarArgInit)
+#endif
 
         // the array elements correspond to the parameters of the ctor above in
         // the same order
@@ -356,8 +351,8 @@ public:
 
     virtual wxMimeTypesManagerImpl *CreateMimeTypesManagerImpl();
 
-    static void SetFactory( wxMimeTypesManagerFactory *factory );
-    static wxMimeTypesManagerFactory *GetFactory();
+    static void Set( wxMimeTypesManagerFactory *factory );
+    static wxMimeTypesManagerFactory *Get();
     
 private:
     static wxMimeTypesManagerFactory *m_factory;