porting forward scrolling fix

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

diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index c845e7ac0a73f11851c2b9562dcdbe4fa0130681..81845d173e46c260804023cb21740e00b8ea5d71 100644 (file)
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -83,12 +83,14 @@ static pascal void NavEventProc(
                 ::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 )
     {


@@ -106,14 +108,13 @@ static pascal void NavEventProc(
                 wxString firstExtension = data->extensions[i].BeforeFirst('|').BeforeFirst(';');
 
                 wxString extension = firstExtension.AfterLast('.') ;
                 wxString firstExtension = data->extensions[i].BeforeFirst('|').BeforeFirst(';');
 
                 wxString extension = firstExtension.AfterLast('.') ;

-                extension.MakeLower() ;

                 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 ) ;


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

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

                     ++filterIndex ;
                 }
 
                     ++filterIndex ;
                 }
 


@@ -166,9 +167,9 @@ void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter )
         if ( current.empty() )
             myData->extensions.Add( myData->name[filterIndex] ) ;
         else
         if ( current.empty() )
             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 ;
 


@@ -216,6 +217,7 @@ 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.length() >= extension.length() && extension == file.Right(extension.length() ) )
                     return true ;
 
                 if ( file.length() >= extension.length() && extension == file.Right(extension.length() ) )
                     return true ;


@@ -228,34 +230,6 @@ 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(
 // end wxmac
 
 wxFileDialog::wxFileDialog(


@@ -273,27 +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 )
+        {
+            // 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);
         {
             AECoerceDesc (theItem, typeFSRef, theItem);

-
-            FSRef fsref ;
-            if ( AEGetDescData (theItem, &fsref, sizeof (FSRef)) == noErr )
+            if ( AEGetDescData (theItem, &fsref, sizeof (FSRef)) == noErr)

             {
             {

-                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()


@@ -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_windowStyle & wxFD_OVERWRITE_PROMPT))
             dialogCreateOptions.optionFlags |= kNavDontConfirmReplacement;
         if (!(m_windowStyle & wxFD_OVERWRITE_PROMPT))
             dialogCreateOptions.optionFlags |= kNavDontConfirmReplacement;

-#endif

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


@@ -384,7 +376,10 @@ int wxFileDialog::ShowModal()
         ::DisposeNavObjectFilterUPP(navFilterUPP);
 
     if (err != noErr)
         ::DisposeNavObjectFilterUPP(navFilterUPP);
 
     if (err != noErr)

+    {
+        ::NavDialogDispose(dialog);

         return wxID_CANCEL;
         return wxID_CANCEL;

+    }

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


@@ -415,6 +410,7 @@ int wxFileDialog::ShowModal()
             if (!thePath)
             {
                 ::NavDisposeReply(&navReply);
             if (!thePath)
             {
                 ::NavDisposeReply(&navReply);

+                ::NavDialogDispose(dialog);

                 return wxID_CANCEL;
             }
 
                 return wxID_CANCEL;
             }
 


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

+    ::NavDialogDispose(dialog);

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