Start/EndDrawingOnTop are still used under Motif, don't deprecate them

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

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index ced6b00150364651f2902f111bd1801e22db99c1..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_
 
 #ifndef _WX_MIMETYPE_H_
 #define _WX_MIMETYPE_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "mimetypebase.h"
-#endif // __GNUG__
-

 // ----------------------------------------------------------------------------
 // headers and such
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers and such
 // ----------------------------------------------------------------------------


@@ -98,7 +94,7 @@ public:
     wxFileTypeInfo() { }
 
     // test if this object can be used
     wxFileTypeInfo() { }
 
     // test if this object can be used

-    bool IsValid() const { return !m_mimeType.IsEmpty(); }
+    bool IsValid() const { return !m_mimeType.empty(); }

 
     // setters
         // set the icon info
 
     // setters
         // set the icon info


@@ -320,7 +316,7 @@ public:
     wxFileType *GetFileTypeFromMimeType(const wxString& mimeType);
 
     // other operations: return true if there were no errors or false if there
     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 ??
 
     //
     // FIXME: These ought to be private ??
 


@@ -388,7 +384,7 @@ private:
 // ----------------------------------------------------------------------------
 
 // the default mime manager for wxWidgets programs
 // ----------------------------------------------------------------------------
 
 // the default mime manager for wxWidgets programs

-WXDLLIMPEXP_DATA_BASE(extern wxMimeTypesManager *) wxTheMimeTypesManager;
+extern WXDLLIMPEXP_DATA_BASE(wxMimeTypesManager *) wxTheMimeTypesManager;

 
 #endif // wxUSE_MIMETYPE
 
 
 #endif // wxUSE_MIMETYPE