set m_encoding in wxCSConv ctor from name

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

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index b398d8c9742bf1f87fa2740d0cde11d61e12232a..bb7a1e62515cf88576e750cdd9b3bec253a8a156 100644 (file)
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -13,10 +13,6 @@
 #ifndef _WX_MIMETYPE_H_
 #define _WX_MIMETYPE_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "mimetypebase.h"
-#endif // __GNUG__
-
 // ----------------------------------------------------------------------------
 // headers and such
 // ----------------------------------------------------------------------------
@@ -320,7 +316,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)
     //
     // FIXME: These ought to be private ??