fix a few hundreds of harmless unused parameters warnings and a couple of real bugs...

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

diff --git a/src/mac/carbon/mimetmac.cpp b/src/mac/carbon/mimetmac.cpp
index 4ee87964e6955090e3852b880905bdceff64f3e9..c06fb8775e81ab92a15fea0f33fc6715c0b0fa2d 100644 (file)
--- a/src/mac/carbon/mimetmac.cpp
+++ b/src/mac/carbon/mimetmac.cpp
@@ -58,7 +58,7 @@
     #include <CoreServices.h>
 #endif
 
     #include <CoreServices.h>
 #endif
 

-
+#ifndef __LP64__

 //   START CODE SAMPLE FROM TECHNOTE 1002 (http://developer.apple.com/technotes/tn/tn1002.html)
 
 // IsRemoteVolume can be used to find out if the
 //   START CODE SAMPLE FROM TECHNOTE 1002 (http://developer.apple.com/technotes/tn/tn1002.html)
 
 // IsRemoteVolume can be used to find out if the


@@ -320,7 +320,7 @@ pascal OSErr FSpGetFullPath( const FSSpec *spec,
 
     return result;
 }
 
     return result;
 }

-
+#endif

 //
 // On the mac there are two ways to open a file - one is through apple events and the
 // finder, another is through mime types.
 //
 // On the mac there are two ways to open a file - one is through apple events and the
 // finder, another is through mime types.


@@ -341,7 +341,7 @@ pascal OSErr FSpGetFullPath( const FSSpec *spec,
 //
 
 // debug helper
 //
 
 // debug helper

-inline void wxLogMimeDebug(const wxChar* szMsg, OSStatus status)
+inline void wxLogMimeDebug(const wxChar* WXUNUSED_UNLESS_DEBUG(szMsg), OSStatus WXUNUSED_UNLESS_DEBUG(status))

 {
     wxLogDebug(wxString::Format(wxT("%s  LINE:%i  OSERROR:%i"), szMsg, __LINE__, (int)status));
 }
 {
     wxLogDebug(wxString::Format(wxT("%s  LINE:%i  OSERROR:%i"), szMsg, __LINE__, (int)status));
 }


@@ -349,14 +349,14 @@ inline void wxLogMimeDebug(const wxChar* szMsg, OSStatus status)
 // in case we're compiling in non-GUI mode
 class WXDLLEXPORT wxIcon;
 
 // in case we're compiling in non-GUI mode
 class WXDLLEXPORT wxIcon;
 

-bool wxFileTypeImpl::SetCommand(const wxString& cmd, const wxString& verb, bool overwriteprompt)
+bool wxFileTypeImpl::SetCommand(const wxString& WXUNUSED(cmd), const wxString& WXUNUSED(verb), bool WXUNUSED(overwriteprompt))

 {
     wxASSERT_MSG( m_manager != NULL , wxT("Bad wxFileType") );
 
     return false;
 }
 
 {
     wxASSERT_MSG( m_manager != NULL , wxT("Bad wxFileType") );
 
     return false;
 }
 

-bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon, int index)
+bool wxFileTypeImpl::SetDefaultIcon(const wxString& WXUNUSED(strIcon), int WXUNUSED(index))

 {
     wxASSERT_MSG( m_manager != NULL , wxT("Bad wxFileType") );
 
 {
     wxASSERT_MSG( m_manager != NULL , wxT("Bad wxFileType") );
 


@@ -459,6 +459,7 @@ wxString wxFileTypeImpl::GetCommand(const wxString& verb) const
 
 #else //carbon/classic implementation
 
 
 #else //carbon/classic implementation
 

+

 wxString wxFileTypeImpl::GetCommand(const wxString& verb) const
 {
     wxASSERT_MSG( m_manager != NULL , wxT("Bad wxFileType") );
 wxString wxFileTypeImpl::GetCommand(const wxString& verb) const
 {
     wxASSERT_MSG( m_manager != NULL , wxT("Bad wxFileType") );


@@ -607,7 +608,7 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString * verbs,
     return ulCount;
 }
 
     return ulCount;
 }
 

-void wxMimeTypesManagerImpl::Initialize(int mailcapStyles, const wxString& extraDir)
+void wxMimeTypesManagerImpl::Initialize(int WXUNUSED(mailcapStyles), const wxString& WXUNUSED(extraDir))

 {
     wxASSERT_MSG(m_hIC == NULL, wxT("Already initialized wxMimeTypesManager!"));
 
 {
     wxASSERT_MSG(m_hIC == NULL, wxT("Already initialized wxMimeTypesManager!"));
 


@@ -789,7 +790,9 @@ pascal  OSStatus  MoreProcGetProcessTypeSignature(
 
     infoRec.processInfoLength = sizeof(ProcessInfoRec);
     infoRec.processName = NULL;
 
     infoRec.processInfoLength = sizeof(ProcessInfoRec);
     infoRec.processName = NULL;

+#ifndef __LP64__

     infoRec.processAppSpec = NULL;
     infoRec.processAppSpec = NULL;

+#endif

 
     if ( pPSN == NULL )
     {
 
     if ( pPSN == NULL )
     {


@@ -1311,7 +1314,6 @@ private:
 // ----------------------------------------------------------------------------
 
 #define wxCFDATA_RELEASEBUFFER  1
 // ----------------------------------------------------------------------------
 
 #define wxCFDATA_RELEASEBUFFER  1

-#define wxCFDATA_RETAINBUFFER   0

 
 class wxCFData
 {
 
 class wxCFData
 {


@@ -1694,8 +1696,18 @@ wxFileType* wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
     if (status == noErr)
     {
         Str255 psCreatorName;
     if (status == noErr)
     {
         Str255 psCreatorName;

+#ifndef __LP64__

         FSSpec dummySpec;
         status = FindApplication(creator, false, psCreatorName, &dummySpec);
         FSSpec dummySpec;
         status = FindApplication(creator, false, psCreatorName, &dummySpec);

+#else
+        FSRef fsref;
+        status = LSFindApplicationForInfo( creator, NULL, NULL, &fsref ,NULL);
+        HFSUniStr255 name;
+        status = FSGetCatalogInfo(&fsref, kFSCatInfoNone, NULL, &name, NULL, NULL);
+        CFStringRef str = FSCreateStringFromHFSUniStr( 0 , &name );
+        CFStringGetPascalString(str, psCreatorName, 256, CFStringGetSystemEncoding());
+        CFRelease( str );
+#endif

 
         if (status == noErr)
         {
 
         if (status == noErr)
         {