Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index 5cc6f991f9c87169be3cc6f1c4a84dd640cca685..60a898e95ad406d70c0a5abae1f7bcf5d0a71fca 100644 (file)
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        filedlg.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        filedlg.cpp

-// Purpose:     wxFileDialog 
+// Purpose:     wxFileDialog

 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01


@@ -9,25 +9,25 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "filedlg.h"
 #endif
 
 #pragma implementation "filedlg.h"
 #endif
 

-#include "wx/defs.h"
+#include "wx/wxprec.h"
+

 #include "wx/app.h"
 #include "wx/utils.h"
 #include "wx/dialog.h"
 #include "wx/filedlg.h"
 #include "wx/intl.h"
 #include "wx/tokenzr.h"
 #include "wx/app.h"
 #include "wx/utils.h"
 #include "wx/dialog.h"
 #include "wx/filedlg.h"
 #include "wx/intl.h"
 #include "wx/tokenzr.h"

+#include "wx/filename.h"

 
 #ifndef __DARWIN__
   #include "PLStringFuncs.h"
 #endif
 
 
 #ifndef __DARWIN__
   #include "PLStringFuncs.h"
 #endif
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
 IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)

-#endif

 
 // begin wxmac
 
 
 // begin wxmac
 


@@ -35,13 +35,8 @@ IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
 
 #include <Navigation.h>
 
 
 #include <Navigation.h>
 

-#ifdef __DARWIN__
-#  include "MoreFilesX.h"
-#else
-#  include "MoreFiles.h"
-#  include "MoreFilesExtras.h"
-#endif
-    
+#include "MoreFilesX.h"
+

 extern bool gUseNavServices ;
 
 // the data we need to pass to our standard file hook routine
 extern bool gUseNavServices ;
 
 // the data we need to pass to our standard file hook routine


@@ -56,12 +51,8 @@ struct OpenUserDataRec {
   wxArrayString      name ;
   wxArrayString      extensions ;
   wxArrayLong        filtermactypes ;
   wxArrayString      name ;
   wxArrayString      extensions ;
   wxArrayLong        filtermactypes ;

-  wxString          defaultLocation;
-#if TARGET_CARBON
+  wxString           defaultLocation;

   CFArrayRef         menuitems ;
   CFArrayRef         menuitems ;

-#else
-  NavMenuItemSpecArrayHandle menuitems ;
-#endif

 };
 
 typedef struct OpenUserDataRec
 };
 
 typedef struct OpenUserDataRec


@@ -72,11 +63,7 @@ static pascal void    NavEventProc(
                                 NavCBRecPtr                    ioParams,
                                 NavCallBackUserData            ioUserData);
 
                                 NavCBRecPtr                    ioParams,
                                 NavCallBackUserData            ioUserData);
 

-#if TARGET_CARBON
-        static NavEventUPP    sStandardNavEventFilter = NewNavEventUPP(NavEventProc);
-#else
-        static NavEventUPP    sStandardNavEventFilter = NewNavEventProc(NavEventProc);
-#endif
+static NavEventUPP    sStandardNavEventFilter = NewNavEventUPP(NavEventProc);

 
 static pascal void
 NavEventProc(
 
 static pascal void
 NavEventProc(


@@ -86,14 +73,9 @@ NavEventProc(
 {
     OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ;
     if (inSelector == kNavCBEvent) {
 {
     OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ;
     if (inSelector == kNavCBEvent) {

-#if TARGET_CARBON
-#else  
-        wxTheApp->MacHandleOneEvent(ioParams->eventData.eventDataParms.event);
-#endif
-    } 
+    }

     else if ( inSelector == kNavCBStart )
     {
     else if ( inSelector == kNavCBStart )
     {

-#if TARGET_CARBON

         if (data && !(data->defaultLocation).IsEmpty())
         {
             // Set default location for the modern Navigation APIs
         if (data && !(data->defaultLocation).IsEmpty())
         {
             // Set default location for the modern Navigation APIs


@@ -104,18 +86,20 @@ NavEventProc(
             if (noErr == ::AECreateDesc(typeFSS, &theFSSpec, sizeof(FSSpec), &theLocation))
                 ::NavCustomControl(ioParams->context, kNavCtlSetLocation, (void *) &theLocation);
         }
             if (noErr == ::AECreateDesc(typeFSS, &theFSSpec, sizeof(FSSpec), &theLocation))
                 ::NavCustomControl(ioParams->context, kNavCtlSetLocation, (void *) &theLocation);
         }

-#else
-        if ( data->menuitems )
-            NavCustomControl(ioParams->context, kNavCtlSelectCustomType, &(*data->menuitems)[data->currentfilter]);
-#endif
+
+        NavMenuItemSpec  menuItem;
+        menuItem.version = kNavMenuItemSpecVersion;
+        menuItem.menuCreator = 'WXNG';
+        menuItem.menuType = data->currentfilter;
+        wxMacStringToPascal( data->name[data->currentfilter] , (StringPtr)(menuItem.menuItemName) ) ;
+        ::NavCustomControl(ioParams->context, kNavCtlSelectCustomType, &menuItem);

     }
     else if ( inSelector == kNavCBPopupMenuSelect )
     {
         NavMenuItemSpec * menu = (NavMenuItemSpec *) ioParams->eventData.eventDataParms.param ;
     }
     else if ( inSelector == kNavCBPopupMenuSelect )
     {
         NavMenuItemSpec * menu = (NavMenuItemSpec *) ioParams->eventData.eventDataParms.param ;

-#if TARGET_CARBON
-#else
-        if ( menu->menuCreator == 'WXNG' )
-#endif
+        const size_t numFilters = data->extensions.GetCount();
+
+        if ( menu->menuType < numFilters )

         {
             data->currentfilter = menu->menuType ;
             if ( data->saveMode )
         {
             data->currentfilter = menu->menuType ;
             if ( data->saveMode )


@@ -124,59 +108,29 @@ NavEventProc(
                 wxString extension =  data->extensions[i].AfterLast('.') ;
                 extension.MakeLower() ;
                 wxString sfilename ;
                 wxString extension =  data->extensions[i].AfterLast('.') ;
                 extension.MakeLower() ;
                 wxString sfilename ;

-                 
-#if TARGET_CARBON
+

                 wxMacCFStringHolder cfString( NavDialogGetSaveFileName( ioParams->context ) , false  );
                 sfilename = cfString.AsString() ;
                 wxMacCFStringHolder cfString( NavDialogGetSaveFileName( ioParams->context ) , false  );
                 sfilename = cfString.AsString() ;

-#else
-                Str255 filename ;
-                // get the current filename
-                NavCustomControl(ioParams->context, kNavCtlGetEditFileName, &filename);
-                sfilename = wxMacMakeStringFromPascal( filename ) ;
-#endif

 
 

-                int pos = sfilename.Find('.',TRUE) ;
+                int pos = sfilename.Find('.', true) ;

                 if ( pos != wxNOT_FOUND )
                 {
                     sfilename = sfilename.Left(pos+1)+extension ;
                 if ( pos != wxNOT_FOUND )
                 {
                     sfilename = sfilename.Left(pos+1)+extension ;

-#if TARGET_CARBON
-                    cfString = sfilename ;
+                    cfString.Assign( sfilename , wxFONTENCODING_DEFAULT ) ;

                     NavDialogSetSaveFileName( ioParams->context , cfString ) ;
                     NavDialogSetSaveFileName( ioParams->context , cfString ) ;

-#else
-                    wxMacStringToPascal( sfilename , filename ) ;
-                    NavCustomControl(ioParams->context, kNavCtlSetEditFileName, &filename);
-#endif

                 }
             }
         }
     }
 }
 
                 }
             }
         }
     }
 }
 

-const wxChar * gfilters[] =
-{
-    wxT("*.TXT") ,
-    wxT("*.TIF") ,
-    wxT("*.JPG") ,
-    
-    NULL 
-} ;
-
-OSType gfiltersmac[] =
-{
-    'TEXT' ,
-    'TIFF' ,
-    'JPEG' ,
-    
-    '****'
-} ;
-

 
 void MakeUserDataRec(OpenUserDataRec    *myData , const wxString& filter )
 {
     myData->menuitems = NULL ;
     myData->currentfilter = 0 ;
 
 void MakeUserDataRec(OpenUserDataRec    *myData , const wxString& filter )
 {
     myData->menuitems = NULL ;
     myData->currentfilter = 0 ;

-    myData->saveMode = FALSE ;
-    
+    myData->saveMode = false ;
+

     if ( filter && filter[0] )
     {
         wxString filter2(filter) ;
     if ( filter && filter[0] )
     {
         wxString filter2(filter) ;


@@ -204,7 +158,7 @@ void MakeUserDataRec(OpenUserDataRec    *myData , const wxString& filter )
         }
         // we allow for compatibility reason to have a single filter expression (like *.*) without
         // an explanatory text, in that case the first part is name and extension at the same time
         }
         // we allow for compatibility reason to have a single filter expression (like *.*) without
         // an explanatory text, in that case the first part is name and extension at the same time

-        
+

         wxASSERT_MSG( filterIndex == 0 || !isName , wxT("incorrect format of format string") ) ;
         if ( current.IsEmpty() )
             myData->extensions.Add( myData->name[filterIndex] ) ;
         wxASSERT_MSG( filterIndex == 0 || !isName , wxT("incorrect format of format string") ) ;
         if ( current.IsEmpty() )
             myData->extensions.Add( myData->name[filterIndex] ) ;


@@ -212,25 +166,32 @@ void MakeUserDataRec(OpenUserDataRec    *myData , const wxString& filter )
             myData->extensions.Add( current.MakeUpper() ) ;
         if ( filterIndex == 0 || isName )
             myData->name.Add( current.MakeUpper() ) ;
             myData->extensions.Add( current.MakeUpper() ) ;
         if ( filterIndex == 0 || isName )
             myData->name.Add( current.MakeUpper() ) ;

-        
+

         ++filterIndex ;
         ++filterIndex ;

-        
+

         const size_t extCount = myData->extensions.GetCount();
         for ( size_t i = 0 ; i < extCount; i++ )
         {
         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
+               }

         }
     }
 }
         }
     }
 }


@@ -239,25 +200,25 @@ static Boolean CheckFile( const wxString &filename , OSType type , OpenUserDataR
 {
     wxString file(filename) ;
     file.MakeUpper() ;
 {
     wxString file(filename) ;
     file.MakeUpper() ;

-    
+

     if ( data->extensions.GetCount() > 0 )
     {
         //for ( int i = 0 ; i < data->numfilters ; ++i )
         int i = data->currentfilter ;
         if ( data->extensions[i].Right(2) == wxT(".*") )
             return true ;
     if ( data->extensions.GetCount() > 0 )
     {
         //for ( int i = 0 ; i < data->numfilters ; ++i )
         int i = data->currentfilter ;
         if ( data->extensions[i].Right(2) == wxT(".*") )
             return true ;

-        
+

         {
             if ( type == (OSType)data->filtermactypes[i] )
                 return true ;
         {
             if ( type == (OSType)data->filtermactypes[i] )
                 return true ;

-            
+

             wxStringTokenizer tokenizer( data->extensions[i] , wxT(";") ) ;
             while( tokenizer.HasMoreTokens() )
             {
                 wxString extension = tokenizer.GetNextToken() ;
                 if ( extension.GetChar(0) == '*' )
                     extension = extension.Mid(1) ;
             wxStringTokenizer tokenizer( data->extensions[i] , wxT(";") ) ;
             while( tokenizer.HasMoreTokens() )
             {
                 wxString extension = tokenizer.GetNextToken() ;
                 if ( extension.GetChar(0) == '*' )
                     extension = extension.Mid(1) ;

-                
+

                 if ( file.Len() >= extension.Len() && extension == file.Right(extension.Len() ) )
                     return true ;
             }
                 if ( file.Len() >= extension.Len() && extension == file.Right(extension.Len() ) )
                     return true ;
             }


@@ -267,7 +228,7 @@ static Boolean CheckFile( const wxString &filename , OSType type , OpenUserDataR
     return true ;
 }
 
     return true ;
 }
 

-#ifndef __DARWIN__
+#if !TARGET_API_MAC_OSX

 static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr)
 {
     OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ;
 static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr)
 {
     OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ;


@@ -275,22 +236,22 @@ static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dat
 
     Boolean visibleFlag;
     Boolean folderFlag;
 
     Boolean visibleFlag;
     Boolean folderFlag;

-    
+

     visibleFlag = ! (myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdFlags & kIsInvisible);
     folderFlag = (myCInfoPBPtr->hFileInfo.ioFlAttrib & 0x10);
     visibleFlag = ! (myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdFlags & kIsInvisible);
     folderFlag = (myCInfoPBPtr->hFileInfo.ioFlAttrib & 0x10);

-    
+

     // because the semantics of the filter proc are "true means don't show
     // it" we need to invert the result that we return
     // because the semantics of the filter proc are "true means don't show
     // it" we need to invert the result that we return

-    
+

     if ( !visibleFlag )
         return true ;
     if ( !visibleFlag )
         return true ;

-        
+

     if ( !folderFlag )
     {
         wxString file = wxMacMakeStringFromPascal( myCInfoPBPtr->hFileInfo.ioNamePtr ) ;
         return !CheckFile( file , myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdType , data ) ;
     }
     if ( !folderFlag )
     {
         wxString file = wxMacMakeStringFromPascal( myCInfoPBPtr->hFileInfo.ioNamePtr ) ;
         return !CheckFile( file , myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdType , data ) ;
     }

-    
+

     return false ;
 }
 #endif
     return false ;
 }
 #endif


@@ -306,15 +267,15 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
 }
 
 pascal Boolean CrossPlatformFilterCallback (
 }
 
 pascal Boolean CrossPlatformFilterCallback (

-    AEDesc *theItem, 
-    void *info, 
-    void *callBackUD, 
+    AEDesc *theItem,
+    void *info,
+    void *callBackUD,

     NavFilterModes filterMode
 )
 {
     bool display = true;
     OpenUserDataRecPtr data = (OpenUserDataRecPtr) callBackUD ;
     NavFilterModes filterMode
 )
 {
     bool display = true;
     OpenUserDataRecPtr data = (OpenUserDataRecPtr) callBackUD ;

-    
+

     if (filterMode == kNavFilteringBrowserList)
     {
         NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ;
     if (filterMode == kNavFilteringBrowserList)
     {
         NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ;


@@ -326,96 +287,92 @@ pascal Boolean CrossPlatformFilterCallback (
                 memcpy( &spec , *theItem->dataHandle , sizeof(FSSpec) ) ;
                 wxString file = wxMacMakeStringFromPascal( spec.name ) ;
                 display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
                 memcpy( &spec , *theItem->dataHandle , sizeof(FSSpec) ) ;
                 wxString file = wxMacMakeStringFromPascal( spec.name ) ;
                 display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;

-            }   
- #if TARGET_CARBON
+            }

             else if ( theItem->descriptorType == typeFSRef )
             {
                 FSRef fsref ;
                 memcpy( &fsref , *theItem->dataHandle , sizeof(FSRef) ) ;
             else if ( theItem->descriptorType == typeFSRef )
             {
                 FSRef fsref ;
                 memcpy( &fsref , *theItem->dataHandle , sizeof(FSRef) ) ;

-                wxString file ;
-                const short maxpath = 1024 ;
-                FSRefMakePath( &fsref , (UInt8*) file.GetWriteBuf(maxpath+1),maxpath) ;
-                file.UngetWriteBuf() ;
+                wxString file = wxMacFSRefToPath( &fsref ) ;

                 display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
             }
                 display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
             }

-#endif

         }
     }
         }
     }

-    
+

     return display;
 }
 
 int wxFileDialog::ShowModal()
 {
     return display;
 }
 
 int wxFileDialog::ShowModal()
 {

-#if TARGET_CARBON

     OSErr err;
     NavDialogCreationOptions dialogCreateOptions;
     // set default options
     ::NavGetDefaultDialogCreationOptions(&dialogCreateOptions);
     OSErr err;
     NavDialogCreationOptions dialogCreateOptions;
     // set default options
     ::NavGetDefaultDialogCreationOptions(&dialogCreateOptions);

-    
+

     // this was always unset in the old code
     dialogCreateOptions.optionFlags &= ~kNavSelectDefaultLocation;
     // this was always unset in the old code
     dialogCreateOptions.optionFlags &= ~kNavSelectDefaultLocation;

-    
-#if wxUSE_UNICODE
-    // 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);
-#else
-    CFStringRef titleRef = ::CFStringCreateWithCString(NULL, 
-                                                       m_message.c_str(),
-                                                       CFStringGetSystemEncoding());
-#endif
-    dialogCreateOptions.windowTitle = titleRef;
-#if wxUSE_UNICODE
-    CFStringRef defaultFileNameRef = ::CFStringCreateWithCString(NULL, 
-                                                                 m_fileName.wc_str(), 
-                                                                 kCFStringEncodingUnicode);
-#else
-    CFStringRef defaultFileNameRef = ::CFStringCreateWithCString(NULL, 
-                                                                 m_fileName.c_str(), 
-                                                                 CFStringGetSystemEncoding());
-#endif
-    dialogCreateOptions.saveFileName = defaultFileNameRef;
+
+    wxMacCFStringHolder message(m_message, m_font.GetEncoding());
+    dialogCreateOptions.windowTitle = message;
+
+    wxMacCFStringHolder defaultFileName(m_fileName, m_font.GetEncoding());
+    dialogCreateOptions.saveFileName = defaultFileName;
+
+

     NavDialogRef dialog;
     NavObjectFilterUPP navFilterUPP = NULL;
     NavDialogRef dialog;
     NavObjectFilterUPP navFilterUPP = NULL;

-    CFArrayRef cfArray = NULL; // for popupExtension
+    CFArrayRef cfArray = NULL; // for popupExtension

     OpenUserDataRec myData;
     myData.defaultLocation = m_dir;
 
     OpenUserDataRec myData;
     myData.defaultLocation = m_dir;
 

-    if (m_dialogStyle & wxSAVE)
-    {
-       dialogCreateOptions.optionFlags |= kNavNoTypePopup;
-       dialogCreateOptions.optionFlags |= kNavDontAutoTranslate;
-       dialogCreateOptions.optionFlags |= kNavDontAddTranslateItems;
-       
-       // The extension is important
-       dialogCreateOptions.optionFlags |= kNavPreserveSaveFileExtension;
-       
-        
-        err = ::NavCreatePutFileDialog(&dialogCreateOptions,
-                                      'TEXT',
-                                      'TEXT',
-                                      sStandardNavEventFilter,
-                                      &myData, // for defaultLocation
-                                      &dialog);
-    }
-    else
+    MakeUserDataRec(&myData , m_wildCard);
+    myData.currentfilter = m_filterIndex;
+    size_t numFilters = myData.extensions.GetCount();
+    if (numFilters)

     {
     {

-        MakeUserDataRec(&myData , m_wildCard);
-        int numfilters = myData.extensions.GetCount();
-        if (numfilters > 0){

         CFMutableArrayRef popup = CFArrayCreateMutable( kCFAllocatorDefault ,
         CFMutableArrayRef popup = CFArrayCreateMutable( kCFAllocatorDefault ,

-            numfilters , &kCFTypeArrayCallBacks ) ;
+            numFilters , &kCFTypeArrayCallBacks ) ;

         dialogCreateOptions.popupExtension = popup ;
         myData.menuitems = dialogCreateOptions.popupExtension ;
         dialogCreateOptions.popupExtension = popup ;
         myData.menuitems = dialogCreateOptions.popupExtension ;

-        for ( size_t i = 0 ; i < numfilters ; ++i ) 
+        for ( size_t i = 0 ; i < numFilters ; ++i )
+        {
+            CFArrayAppendValue( popup , (CFStringRef) wxMacCFStringHolder( myData.name[i] , m_font.GetEncoding() ) ) ;
+        }
+    }
+
+    if (m_dialogStyle & wxSAVE)
+    {
+        myData.saveMode = true;
+
+        if (!numFilters)
+        {
+            dialogCreateOptions.optionFlags |= kNavNoTypePopup;
+        }
+        dialogCreateOptions.optionFlags |= kNavDontAutoTranslate;
+        dialogCreateOptions.optionFlags |= kNavDontAddTranslateItems;
+
+        // The extension is important
+        if (numFilters < 2)
+            dialogCreateOptions.optionFlags |= kNavPreserveSaveFileExtension;
+
+#if TARGET_API_MAC_OSX
+        if (!(m_dialogStyle & wxOVERWRITE_PROMPT))

         {
         {

-            CFArrayAppendValue( popup , (CFStringRef) wxMacCFStringHolder( myData.name[i] ) ) ;
-        }      
+               dialogCreateOptions.optionFlags |= kNavDontConfirmReplacement;
+        }
+#endif
+        err = ::NavCreatePutFileDialog(&dialogCreateOptions,
+                                       // Suppresses the 'Default' (top) menu item
+                                       kNavGenericSignature, kNavGenericSignature,
+                                       sStandardNavEventFilter,
+                                       &myData, // for defaultLocation
+                                       &dialog);

     }
     }

+    else
+    {
+    
+        //let people select bundles/programs in dialogs
+        dialogCreateOptions.optionFlags |= kNavSupportPackages;
+    

         navFilterUPP = NewNavObjectFilterUPP(CrossPlatformFilterCallback);
         err = ::NavCreateGetFileDialog(&dialogCreateOptions,
                                        NULL, // NavTypeListHandle
         navFilterUPP = NewNavObjectFilterUPP(CrossPlatformFilterCallback);
         err = ::NavCreateGetFileDialog(&dialogCreateOptions,
                                        NULL, // NavTypeListHandle


@@ -428,105 +385,46 @@ int wxFileDialog::ShowModal()
 
     if (err == noErr)
         err = ::NavDialogRun(dialog);
 
     if (err == noErr)
         err = ::NavDialogRun(dialog);

-        
+

     // clean up filter related data, etc.
     if (navFilterUPP)
         ::DisposeNavObjectFilterUPP(navFilterUPP);
     if (cfArray)
     // clean up filter related data, etc.
     if (navFilterUPP)
         ::DisposeNavObjectFilterUPP(navFilterUPP);
     if (cfArray)

-    {
-        CFIndex n = ::CFArrayGetCount(cfArray);
-        for (CFIndex i = 0; i < n; i++)
-        {
-            CFStringRef str = (CFStringRef) ::CFArrayGetValueAtIndex(cfArray, i);
-            if (str)
-                ::CFRelease(str);
-        }

         ::CFRelease(cfArray);
         ::CFRelease(cfArray);

-    }
-    if (titleRef)
-        ::CFRelease(titleRef);
-    if (defaultFileNameRef)
-        ::CFRelease(defaultFileNameRef);
-    if (err != noErr) 
+
+    if (err != noErr)

         return wxID_CANCEL;
 
     NavReplyRecord navReply;
     err = ::NavDialogGetReply(dialog, &navReply);
         return wxID_CANCEL;
 
     NavReplyRecord navReply;
     err = ::NavDialogGetReply(dialog, &navReply);

-    if (err == noErr && navReply.validRecord) 
+    if (err == noErr && navReply.validRecord)

     {
         AEKeyword   theKeyword;
         DescType    actualType;
         Size        actualSize;
         FSRef       theFSRef;
     {
         AEKeyword   theKeyword;
         DescType    actualType;
         Size        actualSize;
         FSRef       theFSRef;

-        char        thePath[FILENAME_MAX];
-    
+        wxString thePath ;
+
+        m_filterIndex = myData.currentfilter ;
+

         long count;
         ::AECountItems(&navReply.selection , &count);
         for (long i = 1; i <= count; ++i)
         {
         long count;
         ::AECountItems(&navReply.selection , &count);
         for (long i = 1; i <= count; ++i)
         {

-            err = ::AEGetNthPtr(&(navReply.selection), 1, typeFSRef, &theKeyword, &actualType,
+            err = ::AEGetNthPtr(&(navReply.selection), i, typeFSRef, &theKeyword, &actualType,

                                 &theFSRef, sizeof(theFSRef), &actualSize);
                                 &theFSRef, sizeof(theFSRef), &actualSize);

-            if (err != noErr) 
+            if (err != noErr)

                 break;
 
             if (m_dialogStyle & wxSAVE)
                 break;
 
             if (m_dialogStyle & wxSAVE)

-            {
-                thePath[0] = '\0';
-                CFURLRef parentURLRef = ::CFURLCreateFromFSRef(NULL, &theFSRef);
+                thePath = wxMacFSRefToPath( &theFSRef , navReply.saveFileName ) ;
+            else
+                thePath = wxMacFSRefToPath( &theFSRef ) ;

                 
                 

-                if (parentURLRef)
-                {
-                    CFURLRef 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 
+            if (!thePath)

             {
             {

-                err = ::FSRefMakePath(&theFSRef,
-                                        (UInt8 *)thePath, sizeof(thePath));
-                if (err != noErr) 
-                    break;
+                ::NavDisposeReply(&navReply);
+                return wxID_CANCEL;

             }
             m_path = thePath;
             m_paths.Add(m_path);
             }
             m_path = thePath;
             m_paths.Add(m_path);


@@ -539,163 +437,7 @@ int wxFileDialog::ShowModal()
         m_dir = wxPathOnly(m_path);
     }
     ::NavDisposeReply(&navReply);
         m_dir = wxPathOnly(m_path);
     }
     ::NavDisposeReply(&navReply);

-    
-    return (err == noErr) ? wxID_OK : wxID_CANCEL;
-#else // TARGET_CARBON
-
-    NavDialogOptions           mNavOptions;
-    NavObjectFilterUPP           mNavFilterUPP = NULL;
-    NavPreviewUPP           mNavPreviewUPP = NULL ;
-    NavReplyRecord           mNavReply;
-    AEDesc               mDefaultLocation ;
-    bool               mSelectDefault = false ;
-    OSStatus            err = noErr ;
-    // setup dialog
-        
-    mNavFilterUPP    = nil;
-    mNavPreviewUPP    = nil;
-    mSelectDefault    = false;
-    mDefaultLocation.descriptorType = typeNull;
-    mDefaultLocation.dataHandle     = nil;
-
-    NavGetDefaultDialogOptions(&mNavOptions);
-    wxMacStringToPascal( m_message , (StringPtr)mNavOptions.message ) ;
-    wxMacStringToPascal( m_fileName , (StringPtr)mNavOptions.savedFileName ) ;
-
-    // Set default location, the location
-    //   that's displayed when the dialog
-    //   first appears
-        
-    FSSpec location ;
-    wxMacFilename2FSSpec( m_dir , &location ) ;
-        
-    err = ::AECreateDesc(typeFSS, &location, sizeof(FSSpec), &mDefaultLocation );
-
-    if ( mDefaultLocation.dataHandle ) {
-            
-        if (mSelectDefault) {
-            mNavOptions.dialogOptionFlags |= kNavSelectDefaultLocation;
-        } else {
-            mNavOptions.dialogOptionFlags &= ~kNavSelectDefaultLocation;
-        }
-    }
-
-    memset( &mNavReply , 0 , sizeof( mNavReply ) ) ;
-    mNavReply.validRecord = false;
-    mNavReply.replacing = false;
-    mNavReply.isStationery = false;
-    mNavReply.translationNeeded = false;
-    mNavReply.selection.descriptorType = typeNull;
-    mNavReply.selection.dataHandle = nil;
-    mNavReply.keyScript = smSystemScript;
-    mNavReply.fileTranslation = nil;
-    mNavReply.version = kNavReplyRecordVersion ;
-        
-    // zero all data
-    
-    m_path = wxEmptyString ;
-    m_fileName = wxEmptyString ;
-    m_paths.Empty();
-    m_fileNames.Empty();
-
-    OpenUserDataRec            myData;
-    MakeUserDataRec( &myData , m_wildCard ) ;
-    myData.currentfilter = m_filterIndex ;
-    if ( myData.extensions.GetCount() > 0 )
-    {
-        mNavOptions.popupExtension = (NavMenuItemSpecArrayHandle) NewHandle( sizeof( NavMenuItemSpec ) * myData.extensions.GetCount() ) ;
-        myData.menuitems = mNavOptions.popupExtension ;
-        for ( size_t i = 0 ; i < myData.extensions.GetCount() ; ++i ) 
-        {
-            (*mNavOptions.popupExtension)[i].version     = kNavMenuItemSpecVersion ;
-            (*mNavOptions.popupExtension)[i].menuCreator = 'WXNG' ;
-            // TODO : according to the new docs  -1 to 10 are reserved for the OS
-            (*mNavOptions.popupExtension)[i].menuType    = i ;
-            wxMacStringToPascal( myData.name[i] , (StringPtr)(*mNavOptions.popupExtension)[i].menuItemName ) ;
-        }
-    }
-    if ( m_dialogStyle & wxSAVE )
-    {
-        myData.saveMode = true ;
-
-        mNavOptions.dialogOptionFlags |= kNavDontAutoTranslate ;
-        mNavOptions.dialogOptionFlags |= kNavDontAddTranslateItems ;
-            
-        err = ::NavPutFile(
-                           &mDefaultLocation,
-                           &mNavReply,
-                           &mNavOptions,
-                           sStandardNavEventFilter ,
-                           NULL,
-                           kNavGenericSignature,
-                           &myData);                    // User Data
-        m_filterIndex = myData.currentfilter ;
-    }
-    else
-    {
-        myData.saveMode = false ;

 
 

-        mNavFilterUPP = NewNavObjectFilterUPP( CrossPlatformFilterCallback ) ;
-        if ( m_dialogStyle & wxMULTIPLE )
-            mNavOptions.dialogOptionFlags |= kNavAllowMultipleFiles ;
-        else
-            mNavOptions.dialogOptionFlags &= ~kNavAllowMultipleFiles ;
-            
-        err = ::NavGetFile(
-                           &mDefaultLocation,
-                           &mNavReply,
-                           &mNavOptions,
-                           sStandardNavEventFilter ,
-                           mNavPreviewUPP,
-                           mNavFilterUPP,
-                           NULL ,
-                           &myData);
-        m_filterIndex = myData.currentfilter ;
-    }
-        
-    DisposeNavObjectFilterUPP(mNavFilterUPP);
-    if ( mDefaultLocation.dataHandle != nil )
-    {
-        ::AEDisposeDesc(&mDefaultLocation);
-    }
-        
-    if ( (err != noErr) && (err != userCanceledErr) ) {
-        return wxID_CANCEL ;
-    }
-
-    if (mNavReply.validRecord) {
-        
-        FSSpec  outFileSpec ;
-        AEDesc specDesc ;
-        AEKeyword keyWord ;
-            
-        long count ;
-        ::AECountItems( &mNavReply.selection , &count ) ;
-        for ( long i = 1 ; i <= count ; ++i )
-        {
-            OSErr err = ::AEGetNthDesc( &mNavReply.selection , i , typeFSS, &keyWord , &specDesc);
-            if ( err != noErr ) {
-                m_path = wxT("") ;
-                return wxID_CANCEL ;
-            }            
-            outFileSpec = **(FSSpec**) specDesc.dataHandle;
-            if (specDesc.dataHandle != nil) {
-                ::AEDisposeDesc(&specDesc);
-            }
-            m_path = wxMacFSSpec2MacFilename( &outFileSpec ) ;
-
-            m_paths.Add( m_path ) ;
-            m_fileName = wxFileNameFromPath(m_path);
-            m_fileNames.Add(m_fileName);
-        }
-        // set these to the first hit
-        m_path = m_paths[ 0 ] ;
-        m_fileName = wxFileNameFromPath(m_path);
-        m_dir = wxPathOnly(m_path);
-        NavDisposeReply( &mNavReply ) ;
-        return wxID_OK ;
-    }
-    return wxID_CANCEL;
-#endif // TARGET_CARBON
+    return (err == noErr) ? wxID_OK : wxID_CANCEL;

 }
 
 }