Updated to new PyCrust

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

diff --git a/src/mac/filedlg.cpp b/src/mac/filedlg.cpp
index 406ce43b19e230cf98e0b4b09a71970bba1688d6..6abb80c8d7c6c7e01c78d52f3cc317ce03515d25 100644 (file)
--- a/src/mac/filedlg.cpp
+++ b/src/mac/filedlg.cpp
@@ -20,7 +20,7 @@
 #include "wx/filedlg.h"
 #include "wx/intl.h"
 
 #include "wx/filedlg.h"
 #include "wx/intl.h"
 

-#if !defined(__UNIX__)
+#ifndef __DARWIN__

   #include "PLStringFuncs.h"
 #endif
 
   #include "PLStringFuncs.h"
 #endif
 


@@ -30,22 +30,33 @@ IMPLEMENT_CLASS(wxFileDialog, wxDialog)
 
 // begin wxmac
 
 
 // begin wxmac
 

-#if defined(__UNIX__)
-  #include <Carbon/Carbon.h>
-#else
+#ifndef __DARWIN__

   #include <Navigation.h>
 #endif
 
   #include <Navigation.h>
 #endif
 

-#ifndef __UNIX__
-  #include "morefile.h"
-  #include "moreextr.h"
-  #include "fullpath.h"
-  #include "fspcompa.h"
-  #include "PLStringFuncs.h"
-#endif
+#include "MoreFiles.h"
+#include "MoreFilesExtras.h"

 
 extern bool gUseNavServices ;
 
 
 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)
+// and a copy of the "previous" file spec of the reply record
+// so we can see if the selection has changed
+
+const int kwxMacFileTypes = 10 ;
+
+struct OpenUserDataRec {
+  int           currentfilter ;
+  wxString      name [kwxMacFileTypes] ;
+  wxString      extensions[kwxMacFileTypes] ;
+       OSType                          filtermactypes[kwxMacFileTypes] ;
+       int                                       numfilters ;
+};
+typedef struct OpenUserDataRec
+       OpenUserDataRec, *OpenUserDataRecPtr;
+

 static pascal void     NavEventProc(
                                                                NavEventCallbackMessage         inSelector,
                                                                NavCBRecPtr                                     ioParams,
 static pascal void     NavEventProc(
                                                                NavEventCallbackMessage         inSelector,
                                                                NavCBRecPtr                                     ioParams,


@@ -61,8 +72,9 @@ static pascal void
 NavEventProc(
        NavEventCallbackMessage         inSelector,
        NavCBRecPtr                                     ioParams,
 NavEventProc(
        NavEventCallbackMessage         inSelector,
        NavCBRecPtr                                     ioParams,

-       NavCallBackUserData                     /* ioUserData */)
+       NavCallBackUserData     ioUserData      )

 {
 {

+         OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ;

        if (inSelector == kNavCBEvent) {        
                        // In Universal Headers 3.2, Apple changed the definition of
                /*
        if (inSelector == kNavCBEvent) {        
                        // In Universal Headers 3.2, Apple changed the definition of
                /*


@@ -75,12 +87,18 @@ NavEventProc(
                */
                
          wxTheApp->MacHandleOneEvent(ioParams->eventData.eventDataParms.event);
                */
                
          wxTheApp->MacHandleOneEvent(ioParams->eventData.eventDataParms.event);

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

        }
 }
 
 char * gfilters[] =
 {
        "*.TXT" ,
        }
 }
 
 char * gfilters[] =
 {
        "*.TXT" ,

+       "*.TIF" ,
+       "*.JPG" ,

        
        NULL 
 } ;
        
        NULL 
 } ;


@@ -88,28 +106,12 @@ char * gfilters[] =
 OSType gfiltersmac[] =
 {
        'TEXT' ,
 OSType gfiltersmac[] =
 {
        'TEXT' ,

+       'TIFF' ,
+       'JPEG' ,

        
        '****'
 } ;
 
        
        '****'
 } ;
 

-// 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)
-// and a copy of the "previous" file spec of the reply record
-// so we can see if the selection has changed
-
-const int kwxMacFileTypes = 10 ;
-
-struct OpenUserDataRec {
-       StandardFileReply       *sfrPtr;
-       FSSpec                          oldSelectionFSSpec;
-       char                            filter[kwxMacFileTypes][10] ;
-       OSType                          filtermactypes[kwxMacFileTypes] ;
-       int                                     numfilters ;
-       DialogPtr                       theDlgPtr;
-};
-typedef struct OpenUserDataRec
-       OpenUserDataRec, *OpenUserDataRecPtr;

 
 #if !TARGET_CARBON
 
 
 #if !TARGET_CARBON
 


@@ -238,63 +240,92 @@ static pascal Boolean SFGetFolderModalDialogFilter(DialogPtr theDlgPtr, EventRec
 }
 #endif !TARGET_CARBON
 
 }
 #endif !TARGET_CARBON
 

-void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const char *filter , FileFilterYDUPP fileFilter, StandardFileReply *theSFR)
+void MakeUserDataRec(OpenUserDataRec   *myData , const wxString& filter )

 {
 {

-       Point                           thePt;
-       OpenUserDataRec                 myData;
-       FSSpec                          tempSpec;
-       Boolean                         folderFlag;
-       Boolean                         wasAliasedFlag;
-       DlgHookYDUPP            dlgHookUPP;
-       ModalFilterYDUPP        myModalFilterUPP;
-       OSErr                           err;
-       SFTypeList                      types ;
-       
-       
-       // presumably we're running System 7 or later so CustomGetFile is
-       // available
-       
-       // set initial contents of Select button to a space
-       
-       memcpy( theSFR->sfFile.name , "\p " , 2 ) ;
-       
-       // point the user data parameter at the reply record so we can get to it later
-       
-       myData.sfrPtr = theSFR;
+  myData->currentfilter = 0 ;
+  

        if ( filter && filter[0] )
        {
        if ( filter && filter[0] )
        {

-               myData.numfilters = 1 ;
-               for ( int i = 0 ; i < myData.numfilters ; i++ )
+         wxString filter2(filter) ;
+    int filterIndex = 0;
+    bool isName = true ;
+    wxString current ;
+    for( unsigned int i = 0; i < filter2.Len(); i++ )
+    {
+       if( filter2.GetChar(i) == wxT('|') )
+       {
+        if( isName ) {
+          myData->name[filterIndex] = current ;
+        }
+        else {
+          myData->extensions[filterIndex] = current.MakeUpper() ;
+          ++filterIndex ;
+        }
+        isName = !isName ;
+         current = "" ;
+       }
+       else
+       {
+        current += filter2.GetChar(i) ;
+       }
+    }
+    if ( filterIndex > 0 )
+    {
+      wxASSERT_MSG( !isName , "incorrect format of format string" ) ;
+      myData->extensions[filterIndex] = current.MakeUpper() ;
+      ++filterIndex ;
+    }
+
+               myData->numfilters = filterIndex ;
+               for ( int i = 0 ; i < myData->numfilters ; i++ )

                {
                        int j ;
                {
                        int j ;

-                       
-                       strcpy( myData.filter[i] , filter ) ;
-                       for( j = 0 ; myData.filter[i][j] ; j++ )
-                       {
-                               myData.filter[i][j] = toupper( myData.filter[i][j] ) ;
-                       }

                        for ( j = 0 ; gfilters[j] ; j++ )
                        {
                        for ( j = 0 ; gfilters[j] ; j++ )
                        {

-                               if ( strcmp( myData.filter[i] , gfilters[j] ) == 0 )
+                               if ( strcmp( myData->extensions[i] , gfilters[j] ) == 0 )

                                {
                                {

-                                       myData.filtermactypes[i] = gfiltersmac[j] ;
+                                       myData->filtermactypes[i] = gfiltersmac[j] ;

                                        break ;
                                }
                        }
                        if( gfilters[j] == NULL )
                        {
                                        break ;
                                }
                        }
                        if( gfilters[j] == NULL )
                        {

-                               myData.filtermactypes[i] = '****' ;
+                               myData->filtermactypes[i] = '****' ;

                        }
                }
        }
        else
        {
                        }
                }
        }
        else
        {

-               myData.numfilters = 0 ;
+               myData->numfilters = 0 ;

        }
        }

-       // display the dialog
+
+}

 
 #if !TARGET_CARBON
 
 #if !TARGET_CARBON

+void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const char *filter , FileFilterYDUPP fileFilter, StandardFileReply *theSFR )
+{
+       Point                           thePt;
+       OpenUserDataRec                 myData;
+       FSSpec                          tempSpec;
+       Boolean                         folderFlag;
+       Boolean                         wasAliasedFlag;
+       DlgHookYDUPP            dlgHookUPP;
+       ModalFilterYDUPP        myModalFilterUPP;
+       OSErr                           err;
+       SFTypeList                      types ;

        
        

+       // presumably we're running System 7 or later so CustomGetFile is
+       // available
+       
+       // set initial contents of Select button to a space
+       
+       memcpy( theSFR->sfFile.name , "\p " , 2 ) ;
+       
+       // point the user data parameter at the reply record so we can get to it later
+       
+       MakeUserDataRec( &myData , filter ) ;
+       // display the dialog
+

        dlgHookUPP = NULL ;
 //     dlgHookUPP = NewDlgHookYDProc(SFGetFolderDialogHook);
        myModalFilterUPP = NewModalFilterYDProc(SFGetFolderModalDialogFilter);
        dlgHookUPP = NULL ;
 //     dlgHookUPP = NewDlgHookYDProc(SFGetFolderDialogHook);
        myModalFilterUPP = NewModalFilterYDProc(SFGetFolderModalDialogFilter);


@@ -304,21 +335,20 @@ void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const
        ParamText( message , NULL , NULL , NULL ) ;
        
        CustomGetFile(  fileFilter, 
        ParamText( message , NULL , NULL , NULL ) ;
        
        CustomGetFile(  fileFilter, 

-                                       -1,                                     // show all types
-                                       NULL,
-                                       theSFR,
-                                       kSFGetFileDlgID,
-                                       thePt,                          // top left point
-                                       dlgHookUPP,
-                                       myModalFilterUPP,
-                                       nil,                            // activate list
-                                       nil,                            // activate proc
-                                       &myData);
+                       -1,                             // show all types
+                       NULL,
+                       theSFR,
+                       kSFGetFileDlgID,
+                       thePt,                          // top left point
+                       dlgHookUPP,
+                       myModalFilterUPP,
+                       nil,                            // activate list
+                       nil,                            // activate proc
+                       &myData);

                                        
        DisposeRoutineDescriptor(dlgHookUPP);
        DisposeRoutineDescriptor(myModalFilterUPP);
                                        
        DisposeRoutineDescriptor(dlgHookUPP);
        DisposeRoutineDescriptor(myModalFilterUPP);

-#else
-#endif 
+

        // if cancel wasn't pressed and no fatal error occurred...
        
        if (theSFR->sfGood)
        // if cancel wasn't pressed and no fatal error occurred...
        
        if (theSFR->sfGood)


@@ -329,7 +359,7 @@ void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const
                if (theSFR->sfFile.name[0] == '\0')
                {
                        err = FSMakeFSSpec(theSFR->sfFile.vRefNum, theSFR->sfFile.parID,
                if (theSFR->sfFile.name[0] == '\0')
                {
                        err = FSMakeFSSpec(theSFR->sfFile.vRefNum, theSFR->sfFile.parID,

-                                                               "\p", &tempSpec);
+                                          "\p", &tempSpec);

                        if (err == noErr)
                        {
                                theSFR->sfFile = tempSpec;
                        if (err == noErr)
                        {
                                theSFR->sfFile = tempSpec;


@@ -372,10 +402,47 @@ void ExtendedOpenFile( ConstStr255Param message , ConstStr255Param path , const
                }
        }
 }
                }
        }
 }

+#endif
+
+static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecPtr data)
+{
+    Str255                     filename ;
+    
+#if TARGET_CARBON
+    p2cstrcpy((char *)filename, name) ;
+#else
+    PLstrcpy( filename , name ) ;
+    p2cstr( filename ) ;
+#endif
+    wxString file(filename) ;
+    file.MakeUpper() ;
+    
+    if ( data->numfilters > 0 )
+    {
+       //for ( int i = 0 ; i < data->numfilters ; ++i )
+       int i = data->currentfilter ;
+       if ( data->extensions[i].Right(2) == ".*" )
+           return true ;
+       
+       {
+           if ( type == data->filtermactypes[i] )
+               return true ;
+           
+           wxString extension = data->extensions[i] ;
+           if ( extension.GetChar(0) == '*' )
+               extension = extension.Mid(1) ;
+           
+           if ( file.Len() >= extension.Len() && extension == file.Right(extension.Len() ) )
+               return true ;
+       }
+       return false ;
+    }
+    return true ;
+}

 
 

+#if !TARGET_CARBON

 static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr)
 {      
 static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr)
 {      

-       Str255                  filename ;

        OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ;
        // return true if this item is invisible or a file
 
        OpenUserDataRecPtr data = (OpenUserDataRecPtr) dataPtr ;
        // return true if this item is invisible or a file
 


@@ -393,31 +460,12 @@ static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dat
                
        if ( !folderFlag )
        {
                
        if ( !folderFlag )
        {

-               if ( data->numfilters > 0 )
-               {
-                       PLstrcpy( filename ,myCInfoPBPtr->hFileInfo.ioNamePtr ) ;
-                       if ( filename[0] >= 4 )
-                       {
-                               for( int j = 1 ; j <= filename[0] ; j++ )
-                               {
-                                       filename[j] = toupper( filename[j] ) ;
-                               }
-                               for ( int i = 0 ; i < data->numfilters ; ++i )
-                               {
-                                       if ( myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdType == data->filtermactypes[i] )
-                                               return false ;
-
-                                       if ( strncmp( (char*) filename + 1 + filename[0] - 4 , 
-                                                       & data->filter[i][ strlen(data->filter[i]) - 4 ] , 4 ) == 0 )
-                                                       return false ;
-                               }
-                       }
-                       return true ;                           
-               }
+               return !CheckFile( myCInfoPBPtr->hFileInfo.ioNamePtr , myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdType , data ) ;

        }       
                
        return false ;
 }
        }       
                
        return false ;
 }

+#endif

 
 // end wxmac
 
 
 // end wxmac
 


@@ -496,9 +544,38 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
     m_filterIndex = 1;
 }
 
     m_filterIndex = 1;
 }
 

+
+pascal Boolean CrossPlatformFilterCallback (
+    AEDesc *theItem, 
+    void *info, 
+    void *callBackUD, 
+    NavFilterModes filterMode
+)
+{
+       bool display = true;
+       OpenUserDataRecPtr data = (OpenUserDataRecPtr) callBackUD ;
+
+       if (filterMode == kNavFilteringBrowserList)
+       {
+         NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ;
+               if (theItem->descriptorType == typeFSS && !theInfo->isFolder)
+               {
+                 FSSpec        spec;
+#if TARGET_CARBON
+                 ::AEGetDescData(theItem, &spec, sizeof(FSSpec) ) ;
+#else
+                 memcpy( &spec , (*theItem->dataHandle) , sizeof(FSSpec) ) ;
+#endif
+                 display = CheckFile( spec.name , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
+               }
+       }
+
+       return display;
+}
+

 int wxFileDialog::ShowModal()
 {
 int wxFileDialog::ShowModal()
 {

-       #if !TARGET_CARBON
+#if !TARGET_CARBON

        if ( !gUseNavServices )
        {
        if ( m_dialogStyle & wxSAVE )
        if ( !gUseNavServices )
        {
        if ( m_dialogStyle & wxSAVE )


@@ -507,25 +584,12 @@ int wxFileDialog::ShowModal()
                Str255                          prompt ;
                Str255                          filename ;
 
                Str255                          prompt ;
                Str255                          filename ;
 

-#if TARGET_CARBON
-               c2pstrcpy((StringPtr)prompt, m_message) ;
-#else

                strcpy((char *)prompt, m_message) ;
                c2pstr((char *)prompt ) ;
                strcpy((char *)prompt, m_message) ;
                c2pstr((char *)prompt ) ;

-#endif
-#if TARGET_CARBON
-               c2pstrcpy((StringPtr)filename, m_fileName) ;
-#else

                strcpy((char *)filename, m_fileName) ;
                c2pstr((char *)filename ) ;
                strcpy((char *)filename, m_fileName) ;
                c2pstr((char *)filename ) ;

-#endif

 
 

-               #if !TARGET_CARBON
-               

                StandardPutFile( prompt , filename , &reply ) ;
                StandardPutFile( prompt , filename , &reply ) ;

-       
-               #else
-               #endif

                if ( reply.sfGood == false )
                {
                        m_path = "" ;
                if ( reply.sfGood == false )
                {
                        m_path = "" ;


@@ -533,7 +597,7 @@ int wxFileDialog::ShowModal()
                }
                else
                {
                }
                else
                {

-                       m_path = wxMacFSSpec2UnixFilename( &reply.sfFile ) ;
+                       m_path = wxMacFSSpec2MacFilename( &reply.sfFile ) ;

                        return wxID_OK ;
                }
        }
                        return wxID_OK ;
                }
        }


@@ -543,30 +607,17 @@ int wxFileDialog::ShowModal()
                Str255                          prompt ;
                Str255                          path ;
 
                Str255                          prompt ;
                Str255                          path ;
 

-#if TARGET_CARBON
-               c2pstrcpy((StringPtr)prompt, m_message) ;
-#else

                strcpy((char *)prompt, m_message) ;
                c2pstr((char *)prompt ) ;
                strcpy((char *)prompt, m_message) ;
                c2pstr((char *)prompt ) ;

-#endif
-#if TARGET_CARBON
-               c2pstrcpy((StringPtr)path, m_dir ) ;
-#else

                strcpy((char *)path, m_dir ) ;
                c2pstr((char *)path ) ;
                strcpy((char *)path, m_dir ) ;
                c2pstr((char *)path ) ;

-#endif

 
                StandardFileReply       reply ;
                FileFilterYDUPP crossPlatformFileFilterUPP = 0 ;
 
                StandardFileReply       reply ;
                FileFilterYDUPP crossPlatformFileFilterUPP = 0 ;

-               #if !TARGET_CARBON

                crossPlatformFileFilterUPP = 
                        NewFileFilterYDProc(CrossPlatformFileFilter);
                crossPlatformFileFilterUPP = 
                        NewFileFilterYDProc(CrossPlatformFileFilter);

-               #endif
-

                ExtendedOpenFile( prompt , path , m_wildCard , crossPlatformFileFilterUPP, &reply);
                ExtendedOpenFile( prompt , path , m_wildCard , crossPlatformFileFilterUPP, &reply);

-               #if !TARGET_CARBON

                DisposeFileFilterYDUPP(crossPlatformFileFilterUPP);
                DisposeFileFilterYDUPP(crossPlatformFileFilterUPP);

-               #endif

                if ( reply.sfGood == false )
                {
                        m_path = "" ;
                if ( reply.sfGood == false )
                {
                        m_path = "" ;


@@ -574,7 +625,7 @@ int wxFileDialog::ShowModal()
                }
                else
                {
                }
                else
                {

-                       m_path = wxMacFSSpec2UnixFilename( &reply.sfFile ) ;
+                       m_path = wxMacFSSpec2MacFilename( &reply.sfFile ) ;

                        return wxID_OK ;
                }
        }
                        return wxID_OK ;
                }
        }


@@ -609,7 +660,7 @@ int wxFileDialog::ShowModal()
                //   first appears
                
                FSSpec location ;
                //   first appears
                
                FSSpec location ;

-               wxUnixFilename2FSSpec( m_dir , &location ) ;
+               wxMacFilename2FSSpec( m_dir , &location ) ;

                OSErr err = noErr ;
                
                mDefaultLocation.descriptorType = typeNull;
                OSErr err = noErr ;
                
                mDefaultLocation.descriptorType = typeNull;


@@ -657,6 +708,27 @@ int wxFileDialog::ShowModal()
                }
                else
                {
                }
                else
                {

+               OpenUserDataRec                 myData;
+               MakeUserDataRec( &myData , m_wildCard ) ;
+               NavTypeListHandle typelist = NULL ;
+
+               if ( myData.numfilters > 0 )
+               {
+                 mNavOptions.popupExtension = (NavMenuItemSpecArrayHandle) NewHandle( sizeof( NavMenuItemSpec ) * myData.numfilters ) ;
+                 for ( int i = 0 ; i < myData.numfilters ; ++i ) {
+                   (*mNavOptions.popupExtension)[i].version = kNavMenuItemSpecVersion ;
+                   (*mNavOptions.popupExtension)[i].menuCreator = 'WXNG' ;
+                   (*mNavOptions.popupExtension)[i].menuType = i ;
+          #if TARGET_CARBON
+                       c2pstrcpy((StringPtr)(*mNavOptions.popupExtension)[i].menuItemName, myData.name[i]) ;
+          #else
+                       strcpy((char *)(*mNavOptions.popupExtension)[i].menuItemName, myData.name[i]) ;
+                       c2pstr((char *)(*mNavOptions.popupExtension)[i].menuItemName ) ;
+          #endif
+                 }
+               }
+
+      mNavFilterUPP = NewNavObjectFilterUPP( CrossPlatformFilterCallback ) ;

                        if ( m_dialogStyle & wxMULTIPLE )
                                mNavOptions.dialogOptionFlags |= kNavAllowMultipleFiles ;
                        else
                        if ( m_dialogStyle & wxMULTIPLE )
                                mNavOptions.dialogOptionFlags |= kNavAllowMultipleFiles ;
                        else


@@ -669,10 +741,13 @@ int wxFileDialog::ShowModal()
                                                sStandardNavEventFilter ,
                                                mNavPreviewUPP,
                                                mNavFilterUPP,
                                                sStandardNavEventFilter ,
                                                mNavPreviewUPP,
                                                mNavFilterUPP,

-                                               0L /*inFileTypes.TypeListHandle() */,
-                                               0L);                                                    // User Data
+                                               typelist /*inFileTypes.TypeListHandle() */,
+                                               &myData);                                                       // User Data
+                       if ( typelist )
+                         DisposeHandle( (Handle) typelist ) ;

                }
                
                }
                

+               DisposeNavObjectFilterUPP(mNavFilterUPP);

                if ( mDefaultLocation.dataHandle != nil )
                {
                        ::AEDisposeDesc(&mDefaultLocation);
                if ( mDefaultLocation.dataHandle != nil )
                {
                        ::AEDisposeDesc(&mDefaultLocation);


@@ -704,7 +779,7 @@ int wxFileDialog::ShowModal()
 
                                                                
                                // outFolderDirID = thePB.dirInfo.ioDrDirID;
 
                                                                
                                // outFolderDirID = thePB.dirInfo.ioDrDirID;

-                               m_path = wxMacFSSpec2UnixFilename( &outFileSpec ) ;
+                               m_path = wxMacFSSpec2MacFilename( &outFileSpec ) ;

                                m_paths.Add( m_path ) ;
                    m_fileNames.Add(m_fileName);
                 }
                                m_paths.Add( m_path ) ;
                    m_fileNames.Add(m_fileName);
                 }