wxUSE_TOOLTIPS fix (good grief I think I just did this a couple days ago...)

[wxWidgets.git] / src / mac / carbon / mimetmac.cpp

diff --git a/src/mac/carbon/mimetmac.cpp b/src/mac/carbon/mimetmac.cpp
index 21b804c85b7c02d6e6df45b9f7dcc5fb8c888f75..8231b601a130fe276380a1dc40facea2252337c0 100644 (file)
--- a/src/mac/carbon/mimetmac.cpp
+++ b/src/mac/carbon/mimetmac.cpp
@@ -6,10 +6,10 @@
 // Created:     23.09.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license (part of wxExtra library)
+// Licence:     wxWindows licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef    __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "mimetype.h"
 #endif
 
@@ -20,10 +20,6 @@
   #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
-#endif
-
 #ifndef WX_PRECOMP
   #include "wx/string.h"
   #if wxUSE_GUI
@@ -32,6 +28,8 @@
 #endif //WX_PRECOMP
 
 
+#if wxUSE_MIMETYPE
+
 #include "wx/log.h"
 #include "wx/file.h"
 #include "wx/intl.h"
@@ -46,6 +44,15 @@
 // in case we're compiling in non-GUI mode
 class WXDLLEXPORT wxIcon;
 
+bool wxFileTypeImpl::SetCommand(const wxString& cmd, const wxString& verb, bool overwriteprompt)
+{
+    return FALSE;
+}
+
+bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon, int index)
+{
+    return FALSE;
+}
 
 bool wxFileTypeImpl::GetCommand(wxString *command, const char *verb) const
 {
@@ -83,7 +90,7 @@ bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const
         return FALSE;
 }
 
-bool wxFileTypeImpl::GetIcon(wxIcon *icon) const
+bool wxFileTypeImpl::GetIcon(wxIconLocation *WXUNUSED(icon)) const
 {
     // no such file type or no value or incorrect icon entry
     return FALSE;
@@ -94,9 +101,24 @@ bool wxFileTypeImpl::GetDescription(wxString *desc) const
     return FALSE;
 }
 
-bool wxFileTypeImpl::Unassociate()
+size_t
+wxFileTypeImpl::GetAllCommands(wxArrayString * verbs, wxArrayString * commands,
+                   const wxFileType::MessageParameters& params) const
 {
-    return FALSE;
+    wxFAIL_MSG( _T("wxFileTypeImpl::GetAllCommands() not yet implemented") );
+    return 0;
+}
+
+void
+wxMimeTypesManagerImpl::Initialize(int mailcapStyles, const wxString& extraDir)
+{
+    wxFAIL_MSG( _T("wxMimeTypesManagerImpl::Initialize() not yet implemented") );
+}
+
+void
+wxMimeTypesManagerImpl::ClearData()
+{
+    wxFAIL_MSG( _T("wxMimeTypesManagerImpl::ClearData() not yet implemented") );
 }
 
 // extension -> file type
@@ -105,66 +127,66 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& e)
 {
     wxString ext = e ;
     ext = ext.Lower() ;
-    if ( ext == "txt" )
+    if ( ext == wxT("txt") )
     {
         wxFileType *fileType = new wxFileType;
-        fileType->m_impl->SetFileType("text/text");
+        fileType->m_impl->SetFileType(wxT("text/text"));
         fileType->m_impl->SetExt(ext);
         return fileType;
     }
-    else if ( ext == "htm" || ext == "html" )
+    else if ( ext == wxT("htm") || ext == wxT("html") )
     {
         wxFileType *fileType = new wxFileType;
-        fileType->m_impl->SetFileType("text/html");
+        fileType->m_impl->SetFileType(wxT("text/html"));
         fileType->m_impl->SetExt(ext);
         return fileType;
     }
-    else if ( ext == "gif" )
+    else if ( ext == wxT("gif") )
     {
         wxFileType *fileType = new wxFileType;
-        fileType->m_impl->SetFileType("image/gif");
+        fileType->m_impl->SetFileType(wxT("image/gif"));
         fileType->m_impl->SetExt(ext);
         return fileType;
     }
-    else if ( ext == "png" )
+    else if ( ext == wxT("png" ))
     {
         wxFileType *fileType = new wxFileType;
-        fileType->m_impl->SetFileType("image/png");
+        fileType->m_impl->SetFileType(wxT("image/png"));
         fileType->m_impl->SetExt(ext);
         return fileType;
     }
-    else if ( ext == "jpg" || ext == "jpeg" )
+    else if ( ext == wxT("jpg" )|| ext == wxT("jpeg") )
     {
         wxFileType *fileType = new wxFileType;
-        fileType->m_impl->SetFileType("image/jpeg");
+        fileType->m_impl->SetFileType(wxT("image/jpeg"));
         fileType->m_impl->SetExt(ext);
         return fileType;
     }
-    else if ( ext == "bmp" )
+    else if ( ext == wxT("bmp") )
     {
         wxFileType *fileType = new wxFileType;
-        fileType->m_impl->SetFileType("image/bmp");
+        fileType->m_impl->SetFileType(wxT("image/bmp"));
         fileType->m_impl->SetExt(ext);
         return fileType;
     }
-    else if ( ext == "tif" || ext == "tiff" )
+    else if ( ext == wxT("tif") || ext == wxT("tiff") )
     {
         wxFileType *fileType = new wxFileType;
-        fileType->m_impl->SetFileType("image/tiff");
+        fileType->m_impl->SetFileType(wxT("image/tiff"));
         fileType->m_impl->SetExt(ext);
         return fileType;
     }
-    else if ( ext == "xpm" )
+    else if ( ext == wxT("xpm") )
     {
         wxFileType *fileType = new wxFileType;
-        fileType->m_impl->SetFileType("image/xpm");
+        fileType->m_impl->SetFileType(wxT("image/xpm"));
         fileType->m_impl->SetExt(ext);
         return fileType;
     }
-    else if ( ext == "xbm" )
+    else if ( ext == wxT("xbm") )
     {
         wxFileType *fileType = new wxFileType;
-        fileType->m_impl->SetFileType("image/xbm");
+        fileType->m_impl->SetFileType(wxT("image/xbm"));
         fileType->m_impl->SetExt(ext);
         return fileType;
     }
@@ -182,7 +204,8 @@ wxMimeTypesManagerImpl::GetFileTypeFromMimeType(const wxString& mimeType)
 
 size_t wxMimeTypesManagerImpl::EnumAllFileTypes(wxArrayString& mimetypes)
 {
-    wxFAIL_MSG( _T("TODO") ); // VZ: don't know anything about this for Mac
+    // VZ: don't know anything about this for Mac
+    wxFAIL_MSG( _T("wxMimeTypesManagerImpl::EnumAllFileTypes() not yet implemented") );
 
     return 0;
 }
@@ -190,7 +213,15 @@ size_t wxMimeTypesManagerImpl::EnumAllFileTypes(wxArrayString& mimetypes)
 wxFileType *
 wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
 {
-    wxFAIL_MSG( _T("TODO") );
+    wxFAIL_MSG( _T("wxMimeTypesManagerImpl::Associate() not yet implemented") );
 
     return NULL;
 }
+
+bool
+wxMimeTypesManagerImpl::Unassociate(wxFileType *ft)
+{
+    return FALSE;
+}
+
+#endif //wxUSE_MIMETYPE
\ No newline at end of file