conversion warning gcc 3.3 mac

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

diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index b82a45ee47c736a535b118e2f215a215e60887a9..e70ffbdf4cc66b09eb22e5f144dba27437141289 100644 (file)
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -20,6 +20,7 @@
 #include "wx/filedlg.h"
 #include "wx/intl.h"
 #include "wx/tokenzr.h"
+#include "wx/filename.h"
 
 #ifndef __DARWIN__
   #include "PLStringFuncs.h"
@@ -152,24 +153,6 @@ NavEventProc(
     }
 }
 
-const wxChar * gfilters[] =
-{
-    wxT("*.TXT") ,
-    wxT("*.TIF") ,
-    wxT("*.JPG") ,
-
-    NULL
-} ;
-
-OSType gfiltersmac[] =
-{
-    'TEXT' ,
-    'TIFF' ,
-    'JPEG' ,
-
-    '****'
-} ;
-
 
 void MakeUserDataRec(OpenUserDataRec    *myData , const wxString& filter )
 {
@@ -218,19 +201,26 @@ void MakeUserDataRec(OpenUserDataRec    *myData , const wxString& filter )
         const size_t extCount = myData->extensions.GetCount();
         for ( size_t i = 0 ; i < extCount; i++ )
         {
-            int j ;
-            for ( j = 0 ; gfilters[j] ; j++ )
+            wxUint32 fileType;
+            wxUint32 creator;
+            wxString extension = myData->extensions[i];
+
+            if (extension.GetChar(0) == '*')
+                extension = extension.Mid(1);  // Remove leading *
+
+            if (extension.GetChar(0) == '.')
             {
-                if ( myData->extensions[i] == gfilters[j]  )
-                {
-                    myData->filtermactypes.Add( gfiltersmac[j] ) ;
-                    break ;
-                }
+                extension = extension.Mid(1);  // Remove leading .
             }
-            if( gfilters[j] == NULL )
+       
+            if (wxFileName::MacFindDefaultTypeAndCreator( extension, &fileType, &creator ))
             {
-                myData->filtermactypes.Add( '****' ) ;
+                myData->filtermactypes.Add( (OSType)fileType );
             }
+            else
+            {
+                myData->filtermactypes.Add( '****' ) ;         // We'll fail safe if it's not recognized
+               }
         }
     }
 }
@@ -360,9 +350,9 @@ int wxFileDialog::ShowModal()
     // tried using wxMacCFStringHolder in the code below, but it seems
     // the CFStrings were being released before the save dialog was called,
     // causing a crash - open dialog works fine with or without wxMacCFStringHolder
-    CFStringRef titleRef = ::CFStringCreateWithCString(NULL,
-                                                       m_message.wc_str(),
-                                                       kCFStringEncodingUnicode);
+    CFStringRef titleRef = ::CFStringCreateWithCharacters( kCFAllocatorDefault,
+                                (const unsigned short*)m_message.wc_str(), 
+                                m_message.Len() );
 #else
     CFStringRef titleRef = ::CFStringCreateWithCString(NULL,
                                                        m_message.c_str(),
@@ -370,9 +360,9 @@ int wxFileDialog::ShowModal()
 #endif
     dialogCreateOptions.windowTitle = titleRef;
 #if wxUSE_UNICODE
-    CFStringRef defaultFileNameRef = ::CFStringCreateWithCString(NULL,
-                                                                 m_fileName.wc_str(),
-                                                                 kCFStringEncodingUnicode);
+    CFStringRef defaultFileNameRef = ::CFStringCreateWithCharacters( kCFAllocatorDefault,
+                                        (const unsigned short*)m_fileName.wc_str(), 
+                                        m_fileName.Len() );
 #else
     CFStringRef defaultFileNameRef = ::CFStringCreateWithCString(NULL,
                                                                  m_fileName.c_str(),
@@ -459,8 +449,7 @@ int wxFileDialog::ShowModal()
         DescType    actualType;
         Size        actualSize;
         FSRef       theFSRef;
-        char        thePath[FILENAME_MAX];
-
+        wxString thePath ;
         long count;
         ::AECountItems(&navReply.selection , &count);
         for (long i = 1; i <= count; ++i)
@@ -470,64 +459,36 @@ int wxFileDialog::ShowModal()
             if (err != noErr)
                 break;
 
+            CFURLRef fullURLRef;
             if (m_dialogStyle & wxSAVE)
             {
-                thePath[0] = '\0';
                 CFURLRef parentURLRef = ::CFURLCreateFromFSRef(NULL, &theFSRef);
 
                 if (parentURLRef)
                 {
-                    CFURLRef fullURLRef =
+                    fullURLRef =
                         ::CFURLCreateCopyAppendingPathComponent(NULL,
                                                                 parentURLRef,
                                                                 navReply.saveFileName,
                                                                 false);
                     ::CFRelease(parentURLRef);
-                    if (fullURLRef)
-                    {
-                        CFStringRef cfString = ::CFURLCopyPath(fullURLRef);
-                        ::CFRelease(fullURLRef);
-
-                        if (cfString)
-                        {
-                            // unescape the URL for
-                            // "file name" instead of "file%20name"
-                            CFStringRef cfStringUnescaped =
-                                ::CFURLCreateStringByReplacingPercentEscapes(NULL,
-                                                                             cfString,
-                                                                             CFSTR(""));
-                            ::CFRelease(cfString);
-
-                            if (cfStringUnescaped)
-                            {
-#if wxUSE_UNICODE
-                                ::CFStringGetCString(cfStringUnescaped,
-                                                    thePath,
-                                                    FILENAME_MAX,
-                                                    kCFStringEncodingUnicode);
-#else
-                                ::CFStringGetCString(cfStringUnescaped,
-                                                    thePath,
-                                                    FILENAME_MAX,
-                                                    CFStringGetSystemEncoding());
-#endif
-                                ::CFRelease(cfStringUnescaped);
-                            }
-                        }
-                    }
-                }
-                if (!thePath[0])
-                {
-                    ::NavDisposeReply(&navReply);
-                    return wxID_CANCEL;
                 }
             }
             else
             {
-                err = ::FSRefMakePath(&theFSRef,
-                                        (UInt8 *)thePath, sizeof(thePath));
-                if (err != noErr)
-                    break;
+                fullURLRef = ::CFURLCreateFromFSRef(NULL, &theFSRef);
+            }
+#ifdef __UNIX__
+            CFURLPathStyle pathstyle = kCFURLPOSIXPathStyle;
+#else
+            CFURLPathStyle pathstyle = kCFURLHFSPathStyle;
+#endif
+            CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, pathstyle);
+            thePath = wxMacCFStringHolder(cfString).AsString();
+            if (!thePath)
+            {
+                ::NavDisposeReply(&navReply);
+                return wxID_CANCEL;
             }
             m_path = thePath;
             m_paths.Add(m_path);