Make wxImageList not copiable (fixes #10503), replace wxList with wxObjectList

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

diff --git a/include/wx/msw/mimetype.h b/include/wx/msw/mimetype.h
index 041ddcfd585c0b7ba5b4ea66ce2961c142f8e587..f93b67c5bf3c20012d99e4d661eb619bba5dff85 100644 (file)
--- a/include/wx/msw/mimetype.h
+++ b/include/wx/msw/mimetype.h
@@ -12,10 +12,6 @@
 #ifndef _MIMETYPE_IMPL_H
 #define _MIMETYPE_IMPL_H
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "mimetype.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_MIMETYPE
@@ -57,10 +53,10 @@ public:
     bool Unassociate();
 
     // 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 = wxEmptyString, int index = 0);
 
@@ -70,13 +66,13 @@ public:
 private:
     // helper function: reads the command corresponding to the specified verb
     // from the registry (returns an empty string if not found)
-    wxString GetCommand(const wxChar *verb) const;
+    wxString GetCommand(const wxString& verb) const;
 
     // get the registry path for the given verb
     wxString GetVerbPath(const wxString& verb) const;
 
     // check that the registry key for our extension exists, create it if it
-    // doesn't, return FALSE if this failed
+    // doesn't, return false if this failed
     bool EnsureExtKeyExists();
 
     wxString m_strFileType,         // may be empty
@@ -106,12 +102,6 @@ public:
 
     size_t EnumAllFileTypes(wxArrayString& mimetypes);
 
-    // this are NOPs under Windows
-    bool ReadMailcap(const wxString& WXUNUSED(filename), bool WXUNUSED(fallback) = TRUE)
-        { return TRUE; }
-    bool ReadMimeTypes(const wxString& WXUNUSED(filename))
-        { return TRUE; }
-
     // create a new filetype association
     wxFileType *Associate(const wxFileTypeInfo& ftInfo);