mac cleanup

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

diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index e6fda89c47960c7d96a10ef1156825ffca8e39c1..81845d173e46c260804023cb21740e00b8ea5d71 100644 (file)
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filedlg.cpp
+// Name:        src/mac/carbon/filedlg.cpp

 // Purpose:     wxFileDialog
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxFileDialog
 // Author:      Stefan Csomor
 // Modified by:


@@ -11,27 +11,29 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/app.h"
-#include "wx/utils.h"
-#include "wx/dialog.h"
+#if wxUSE_FILEDLG
+

 #include "wx/filedlg.h"
 #include "wx/filedlg.h"

-#include "wx/intl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/dialog.h"
+#endif
+

 #include "wx/tokenzr.h"
 #include "wx/filename.h"
 
 #include "wx/mac/private.h"
 
 #ifndef __DARWIN__
 #include "wx/tokenzr.h"
 #include "wx/filename.h"
 
 #include "wx/mac/private.h"
 
 #ifndef __DARWIN__

-   #include <Navigation.h>
-   #include "PLStringFuncs.h"
+    #include <Navigation.h>
+    #include "PLStringFuncs.h"

 #endif
 
 #endif
 

-#include "MoreFilesX.h"
-

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

-extern bool gUseNavServices;
-

 // the data we need to pass to our standard file hook routine
 // includes a pointer to the dialog, a pointer to the standard
 // file reply record (so we can inspect the current selection)
 // the data we need to pass to our standard file hook routine
 // includes a pointer to the dialog, a pointer to the standard
 // file reply record (so we can inspect the current selection)


@@ -70,23 +72,25 @@ static pascal void NavEventProc(
     }
     else if ( inSelector == kNavCBStart )
     {
     }
     else if ( inSelector == kNavCBStart )
     {

-        if (data && !(data->defaultLocation).IsEmpty())
+        if (data && !(data->defaultLocation).empty())

         {
             // Set default location for the modern Navigation APIs
             // Apple Technical Q&A 1151
         {
             // Set default location for the modern Navigation APIs
             // Apple Technical Q&A 1151

-            FSSpec theFSSpec;
-            wxMacFilename2FSSpec(data->defaultLocation, &theFSSpec);
+            FSRef theFile;
+            wxMacPathToFSRef(data->defaultLocation, &theFile);

             AEDesc theLocation = { typeNull, NULL };
             AEDesc theLocation = { typeNull, NULL };

-            if (noErr == ::AECreateDesc(typeFSS, &theFSSpec, sizeof(FSSpec), &theLocation))
+            if (noErr == ::AECreateDesc(typeFSRef, &theFile, sizeof(FSRef), &theLocation))

                 ::NavCustomControl(ioParams->context, kNavCtlSetLocation, (void *) &theLocation);
         }
 
                 ::NavCustomControl(ioParams->context, kNavCtlSetLocation, (void *) &theLocation);
         }
 

-        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);
+        if( data->extensions.GetCount() > 0 )
+        {
+            NavMenuItemSpec  menuItem;
+            memset( &menuItem, 0, sizeof(menuItem) );
+            menuItem.version = kNavMenuItemSpecVersion;
+            menuItem.menuType = data->currentfilter;
+            ::NavCustomControl(ioParams->context, kNavCtlSelectCustomType, &menuItem);
+        }

     }
     else if ( inSelector == kNavCBPopupMenuSelect )
     {
     }
     else if ( inSelector == kNavCBPopupMenuSelect )
     {


@@ -99,15 +103,18 @@ static pascal void NavEventProc(
             if ( data->saveMode )
             {
                 int i = menu->menuType ;
             if ( data->saveMode )
             {
                 int i = menu->menuType ;

-                wxString extension =  data->extensions[i].AfterLast('.') ;
-                extension.MakeLower() ;
+
+                // isolate the first extension string
+                wxString firstExtension = data->extensions[i].BeforeFirst('|').BeforeFirst(';');
+
+                wxString extension = firstExtension.AfterLast('.') ;

                 wxString sfilename ;
 
                 wxMacCFStringHolder cfString( NavDialogGetSaveFileName( ioParams->context ) , false  );
                 sfilename = cfString.AsString() ;
 
                 int pos = sfilename.Find('.', true) ;
                 wxString sfilename ;
 
                 wxMacCFStringHolder cfString( NavDialogGetSaveFileName( ioParams->context ) , false  );
                 sfilename = cfString.AsString() ;
 
                 int pos = sfilename.Find('.', true) ;

-                if ( pos != wxNOT_FOUND )
+                if ( pos != wxNOT_FOUND && extension != wxT("*") )

                 {
                     sfilename = sfilename.Left(pos+1)+extension ;
                     cfString.Assign( sfilename , wxFONTENCODING_DEFAULT ) ;
                 {
                     sfilename = sfilename.Left(pos+1)+extension ;
                     cfString.Assign( sfilename , wxFONTENCODING_DEFAULT ) ;


@@ -124,14 +131,14 @@ void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter )
     myData->currentfilter = 0 ;
     myData->saveMode = false ;
 
     myData->currentfilter = 0 ;
     myData->saveMode = false ;
 

-    if ( filter && filter[0] )
+    if ( !filter.empty() )

     {
         wxString filter2(filter) ;
         int filterIndex = 0;
         bool isName = true ;
         wxString current ;
 
     {
         wxString filter2(filter) ;
         int filterIndex = 0;
         bool isName = true ;
         wxString current ;
 

-        for ( unsigned int i = 0; i < filter2.Len() ; i++ )
+        for ( unsigned int i = 0; i < filter2.length() ; i++ )

         {
             if ( filter2.GetChar(i) == wxT('|') )
             {
         {
             if ( filter2.GetChar(i) == wxT('|') )
             {


@@ -141,7 +148,7 @@ void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter )
                 }
                 else
                 {
                 }
                 else
                 {

-                    myData->extensions.Add( current.MakeUpper() ) ;
+                    myData->extensions.Add( current ) ;

                     ++filterIndex ;
                 }
 
                     ++filterIndex ;
                 }
 


@@ -157,12 +164,12 @@ void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter )
         // 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") ) ;
         // 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() )
+        if ( current.empty() )

             myData->extensions.Add( myData->name[filterIndex] ) ;
         else
             myData->extensions.Add( myData->name[filterIndex] ) ;
         else

-            myData->extensions.Add( current.MakeUpper() ) ;
+            myData->extensions.Add( current ) ;

         if ( filterIndex == 0 || isName )
         if ( filterIndex == 0 || isName )

-            myData->name.Add( current.MakeUpper() ) ;
+            myData->name.Add( current ) ;

 
         ++filterIndex ;
 
 
         ++filterIndex ;
 


@@ -173,13 +180,13 @@ void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter )
             wxString extension = myData->extensions[i];
 
             // Remove leading '*'
             wxString extension = myData->extensions[i];
 
             // Remove leading '*'

-            if (extension.GetChar(0) == '*')
+            if (extension.length() && (extension.GetChar(0) == '*'))

                 extension = extension.Mid( 1 );
 
             // Remove leading '.'
                 extension = extension.Mid( 1 );
 
             // Remove leading '.'

-            if (extension.GetChar(0) == '.')
+            if (extension.length() && (extension.GetChar(0) == '.'))

                 extension = extension.Mid( 1 );
                 extension = extension.Mid( 1 );

-       
+

             if (wxFileName::MacFindDefaultTypeAndCreator( extension, &fileType, &creator ))
                 myData->filtermactypes.Add( (OSType)fileType );
             else
             if (wxFileName::MacFindDefaultTypeAndCreator( extension, &fileType, &creator ))
                 myData->filtermactypes.Add( (OSType)fileType );
             else


@@ -210,8 +217,9 @@ static Boolean CheckFile( const wxString &filename , OSType type , OpenUserDataR
                 wxString extension = tokenizer.GetNextToken() ;
                 if ( extension.GetChar(0) == '*' )
                     extension = extension.Mid(1) ;
                 wxString extension = tokenizer.GetNextToken() ;
                 if ( extension.GetChar(0) == '*' )
                     extension = extension.Mid(1) ;

+                extension.MakeUpper();

 
 

-                if ( file.Len() >= extension.Len() && extension == file.Right(extension.Len() ) )
+                if ( file.length() >= extension.length() && extension == file.Right(extension.length() ) )

                     return true ;
             }
         }
                     return true ;
             }
         }


@@ -222,41 +230,13 @@ static Boolean CheckFile( const wxString &filename , OSType type , OpenUserDataR
     return true ;
 }
 
     return true ;
 }
 

-#if !TARGET_API_MAC_OSX
-static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr)
-{
-    OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ;
-    // return true if this item is invisible or a file
-
-    Boolean visibleFlag;
-    Boolean folderFlag;
-
-    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
-
-    if ( !visibleFlag )
-        return true ;
-
-    if ( !folderFlag )
-    {
-        wxString file = wxMacMakeStringFromPascal( myCInfoPBPtr->hFileInfo.ioNamePtr ) ;
-        return !CheckFile( file , myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdType , data ) ;
-    }
-
-    return false ;
-}
-#endif
-

 // end wxmac
 
 wxFileDialog::wxFileDialog(
     wxWindow *parent, const wxString& message,
     const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,
 // end wxmac
 
 wxFileDialog::wxFileDialog(
     wxWindow *parent, const wxString& message,
     const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,

-    long style, const wxPoint& pos)
-    : wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos)
+    long style, const wxPoint& pos, const wxSize& sz, const wxString& name)
+    : wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name)

 {
     wxASSERT_MSG( NavServicesAvailable() , wxT("Navigation Services are not running") ) ;
 }
 {
     wxASSERT_MSG( NavServicesAvailable() , wxT("Navigation Services are not running") ) ;
 }


@@ -267,32 +247,47 @@ pascal Boolean CrossPlatformFilterCallback(
     void *callBackUD,
     NavFilterModes filterMode )
 {
     void *callBackUD,
     NavFilterModes filterMode )
 {

-    bool display = true;

     OpenUserDataRecPtr data = (OpenUserDataRecPtr) callBackUD ;
 
     if (filterMode == kNavFilteringBrowserList)
     {
     OpenUserDataRecPtr data = (OpenUserDataRecPtr) callBackUD ;
 
     if (filterMode == kNavFilteringBrowserList)
     {

+        // We allow navigation to all folders. For files, we check against the current
+        // filter string.
+        // However, packages should be dealt with like files and not like folders. So
+        // check if a folder is a package before deciding what to do.

         NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ;
         NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ;

-        if ( !theInfo->isFolder )
+        FSRef fsref;
+
+        if ( theInfo->isFolder )

         {
         {

-            if (theItem->descriptorType == typeFSS)
-            {
-                FSSpec    spec;
-                memcpy( &spec , *theItem->dataHandle , sizeof(FSSpec) ) ;
-                wxString file = wxMacMakeStringFromPascal( spec.name ) ;
-                display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
-            }
-            else if ( theItem->descriptorType == typeFSRef )
+            // check bundle bit (using Finder Services - used by OS9 on some bundles)
+            FSCatalogInfo catalogInfo;
+            if (FSGetCatalogInfo (&fsref, kFSCatInfoFinderInfo, &catalogInfo, NULL, NULL, NULL) != noErr)
+                return true;
+
+            // Check bundle item (using Launch Services - used by OS-X through info.plist or APP)
+            LSItemInfoRecord lsInfo;
+            if (LSCopyItemInfoForRef(&fsref, kLSRequestBasicFlagsOnly, &lsInfo ) != noErr)
+                return true;
+
+            // If it's not a bundle, then it's a normal folder and it passes our filter
+            FileInfo *fileInfo = (FileInfo *) catalogInfo.finderInfo;
+            if ( !(fileInfo->finderFlags & kHasBundle) &&
+                 !(lsInfo.flags & (kLSItemInfoIsApplication | kLSItemInfoIsPackage)) )
+                return true;
+        }
+        else
+        {
+            AECoerceDesc (theItem, typeFSRef, theItem);
+            if ( AEGetDescData (theItem, &fsref, sizeof (FSRef)) == noErr)

             {
             {

-                FSRef fsref ;
-                memcpy( &fsref , *theItem->dataHandle , sizeof(FSRef) ) ;

                 wxString file = wxMacFSRefToPath( &fsref ) ;
                 wxString file = wxMacFSRefToPath( &fsref ) ;

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

             }
         }
     }
 
             }
         }
     }
 

-    return display;
+    return true;

 }
 
 int wxFileDialog::ShowModal()
 }
 
 int wxFileDialog::ShowModal()


@@ -315,7 +310,6 @@ int wxFileDialog::ShowModal()
 
     NavDialogRef dialog;
     NavObjectFilterUPP navFilterUPP = NULL;
 
     NavDialogRef dialog;
     NavObjectFilterUPP navFilterUPP = NULL;

-    CFArrayRef cfArray = NULL; // for popupExtension

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


@@ -334,7 +328,7 @@ int wxFileDialog::ShowModal()
         }
     }
 
         }
     }
 

-    if (m_dialogStyle & wxSAVE)
+    if (HasFdFlag(wxFD_SAVE))

     {
         myData.saveMode = true;
 
     {
         myData.saveMode = true;
 


@@ -347,10 +341,8 @@ int wxFileDialog::ShowModal()
         if (numFilters < 2)
             dialogCreateOptions.optionFlags |= kNavPreserveSaveFileExtension;
 
         if (numFilters < 2)
             dialogCreateOptions.optionFlags |= kNavPreserveSaveFileExtension;
 

-#if TARGET_API_MAC_OSX
-        if (!(m_dialogStyle & wxOVERWRITE_PROMPT))
+        if (!(m_windowStyle & wxFD_OVERWRITE_PROMPT))

             dialogCreateOptions.optionFlags |= kNavDontConfirmReplacement;
             dialogCreateOptions.optionFlags |= kNavDontConfirmReplacement;

-#endif

 
         err = ::NavCreatePutFileDialog(
             &dialogCreateOptions,
 
         err = ::NavCreatePutFileDialog(
             &dialogCreateOptions,


@@ -364,7 +356,7 @@ int wxFileDialog::ShowModal()
     {
         // let the user select bundles/programs in dialogs
         dialogCreateOptions.optionFlags |= kNavSupportPackages;
     {
         // let the user select bundles/programs in dialogs
         dialogCreateOptions.optionFlags |= kNavSupportPackages;

-    
+

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


@@ -382,11 +374,12 @@ int wxFileDialog::ShowModal()
     // clean up filter related data, etc.
     if (navFilterUPP)
         ::DisposeNavObjectFilterUPP(navFilterUPP);
     // clean up filter related data, etc.
     if (navFilterUPP)
         ::DisposeNavObjectFilterUPP(navFilterUPP);

-    if (cfArray)
-        ::CFRelease(cfArray);

 
     if (err != noErr)
 
     if (err != noErr)

+    {
+        ::NavDialogDispose(dialog);

         return wxID_CANCEL;
         return wxID_CANCEL;

+    }

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


@@ -409,14 +402,15 @@ int wxFileDialog::ShowModal()
             if (err != noErr)
                 break;
 
             if (err != noErr)
                 break;
 

-            if (m_dialogStyle & wxSAVE)
+            if (HasFdFlag(wxFD_SAVE))

                 thePath = wxMacFSRefToPath( &theFSRef, navReply.saveFileName );
             else
                 thePath = wxMacFSRefToPath( &theFSRef );
                 thePath = wxMacFSRefToPath( &theFSRef, navReply.saveFileName );
             else
                 thePath = wxMacFSRefToPath( &theFSRef );

-                
+

             if (!thePath)
             {
                 ::NavDisposeReply(&navReply);
             if (!thePath)
             {
                 ::NavDisposeReply(&navReply);

+                ::NavDialogDispose(dialog);

                 return wxID_CANCEL;
             }
 
                 return wxID_CANCEL;
             }
 


@@ -433,7 +427,10 @@ int wxFileDialog::ShowModal()
     }
 
     ::NavDisposeReply(&navReply);
     }
 
     ::NavDisposeReply(&navReply);

+    ::NavDialogDispose(dialog);

 
     return (err == noErr) ? wxID_OK : wxID_CANCEL;
 }
 
 
     return (err == noErr) ? wxID_OK : wxID_CANCEL;
 }
 

+#endif // wxUSE_FILEDLG
+