added const for Mac OS X compilation

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

diff --git a/src/mac/carbon/dirdlg.cpp b/src/mac/carbon/dirdlg.cpp
index 02bbef6a204bad2100a085c8786858f9820e07b6..89b3892451a5fd8ce04cc44f1f4c3666fe1a0f5a 100644 (file)
--- a/src/mac/carbon/dirdlg.cpp
+++ b/src/mac/carbon/dirdlg.cpp
@@ -20,16 +20,26 @@
 
 #include "wx/cmndata.h"
 
 
 #include "wx/cmndata.h"
 

+#if defined(__UNIX__)
+  #include <Carbon/Carbon.h>
+#else
+  #include <Navigation.h>
+#endif
+

 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)
 #endif
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)
 #endif
 

+bool gUseNavServices = NavServicesAvailable() ;
+

 // 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
 
 // 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
 

+#if !TARGET_CARBON
+

 struct UserDataRec {
        StandardFileReply       *sfrPtr;
        FSSpec                          oldSelectionFSSpec;
 struct UserDataRec {
        StandardFileReply       *sfrPtr;
        FSSpec                          oldSelectionFSSpec;


@@ -38,8 +48,6 @@ struct UserDataRec {
 typedef struct UserDataRec
        UserDataRec, *UserDataRecPtr;
 
 typedef struct UserDataRec
        UserDataRec, *UserDataRecPtr;
 

-#if !TARGET_CARBON
-

 enum {
        kSelectItem = 10,                       // select button item number
        kSFGetFolderDlgID = 250,        // dialog resource number
 enum {
        kSelectItem = 10,                       // select button item number
        kSFGetFolderDlgID = 250,        // dialog resource number


@@ -174,7 +182,7 @@ static Boolean SameFSSpec(FSSpecPtr spec1, FSSpecPtr spec2)
 // flashing of the button when the key is hit
 
 static pascal Boolean SFGetFolderModalDialogFilter(DialogPtr theDlgPtr, EventRecord *eventRec,
 // flashing of the button when the key is hit
 
 static pascal Boolean SFGetFolderModalDialogFilter(DialogPtr theDlgPtr, EventRecord *eventRec,

-                                                                                       short *item, Ptr dataPtr)
+                                                                                       short *item, void *dataPtr)

 {
 #pragma unused (dataPtr)
 
 {
 #pragma unused (dataPtr)
 


@@ -202,7 +210,7 @@ static pascal Boolean SFGetFolderModalDialogFilter(DialogPtr theDlgPtr, EventRec
 // MyDlgHook is a hook routine that maps the select button to Open
 // and sets the Select button name
 
 // MyDlgHook is a hook routine that maps the select button to Open
 // and sets the Select button name
 

-static pascal short SFGetFolderDialogHook(short item, DialogPtr theDlgPtr, Ptr dataPtr)
+static pascal short SFGetFolderDialogHook(short item, DialogPtr theDlgPtr, void *dataPtr)

 {
        UserDataRecPtr  theUserDataRecPtr;
        long                    desktopDirID;
 {
        UserDataRecPtr  theUserDataRecPtr;
        long                    desktopDirID;


@@ -307,7 +315,6 @@ static pascal short SFGetFolderDialogHook(short item, DialogPtr theDlgPtr, Ptr d
        
        return item;
 }
        
        return item;
 }

-#endif

 
 void StandardGetFolder( ConstStr255Param message , ConstStr255Param path , FileFilterYDUPP fileFilter, StandardFileReply *theSFR)
 {
 
 void StandardGetFolder( ConstStr255Param message , ConstStr255Param path , FileFilterYDUPP fileFilter, StandardFileReply *theSFR)
 {


@@ -415,7 +422,7 @@ void StandardGetFolder( ConstStr255Param message , ConstStr255Param path , FileF
        }
 }
 
        }
 }
 

-static pascal Boolean OnlyVisibleFoldersCustomFileFilter(CInfoPBPtr myCInfoPBPtr, Ptr dataPtr)
+static pascal Boolean OnlyVisibleFoldersCustomFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr)

 {
 #pragma unused (dataPtr)
 
 {
 #pragma unused (dataPtr)
 


@@ -433,6 +440,9 @@ static pascal Boolean OnlyVisibleFoldersCustomFileFilter(CInfoPBPtr myCInfoPBPtr
        return !(visibleFlag && folderFlag);
 }
 
        return !(visibleFlag && folderFlag);
 }
 

+#endif
+
+

 wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
         const wxString& defaultPath,
         long style, const wxPoint& pos)
 wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
         const wxString& defaultPath,
         long style, const wxPoint& pos)


@@ -445,28 +455,36 @@ wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
 
 int wxDirDialog::ShowModal()
 {
 
 int wxDirDialog::ShowModal()
 {

+       #if !TARGET_CARBON
+       if ( !gUseNavServices )

        {
                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_path ) ;
+#else

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

+#endif

 
                StandardFileReply       reply ;
                FileFilterYDUPP         invisiblesExcludedCustomFilterUPP = 0 ;
 
                StandardFileReply       reply ;
                FileFilterYDUPP         invisiblesExcludedCustomFilterUPP = 0 ;

-               #if !TARGET_CARBON

                invisiblesExcludedCustomFilterUPP = 
                        NewFileFilterYDProc(OnlyVisibleFoldersCustomFileFilter);
                invisiblesExcludedCustomFilterUPP = 
                        NewFileFilterYDProc(OnlyVisibleFoldersCustomFileFilter);

-               #endif
+

 
                StandardGetFolder( prompt , path , invisiblesExcludedCustomFilterUPP, &reply);
        
 
                StandardGetFolder( prompt , path , invisiblesExcludedCustomFilterUPP, &reply);
        

-               #if !TARGET_CARBON
+

                DisposeRoutineDescriptor(invisiblesExcludedCustomFilterUPP);
                DisposeRoutineDescriptor(invisiblesExcludedCustomFilterUPP);

-               #endif
+

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


@@ -477,7 +495,105 @@ int wxDirDialog::ShowModal()
                        m_path = wxMacFSSpec2UnixFilename( &reply.sfFile ) ;
                        return wxID_OK ;
                }
                        m_path = wxMacFSSpec2UnixFilename( &reply.sfFile ) ;
                        return wxID_OK ;
                }

+               return wxID_CANCEL;
+       }
+       else
+       #endif
+       {
+               NavDialogOptions                mNavOptions;
+               NavObjectFilterUPP              mNavFilterUPP = NULL;
+               NavPreviewUPP                   mNavPreviewUPP = NULL ;
+               NavReplyRecord                  mNavReply;
+               AEDesc*                                 mDefaultLocation = NULL ;
+               bool                                    mSelectDefault = false ;
+               
+               ::NavGetDefaultDialogOptions(&mNavOptions);
+       
+               mNavFilterUPP   = nil;
+               mNavPreviewUPP  = nil;
+               mSelectDefault  = false;
+               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;
+               
+               // Set default location, the location
+               //   that's displayed when the dialog
+               //   first appears
+               
+               if ( mDefaultLocation ) {
+                       
+                       if (mSelectDefault) {
+                               mNavOptions.dialogOptionFlags |= kNavSelectDefaultLocation;
+                       } else {
+                               mNavOptions.dialogOptionFlags &= ~kNavSelectDefaultLocation;
+                       }
+               }
+               
+               OSErr err = ::NavChooseFolder(
+                                                       mDefaultLocation,
+                                                       &mNavReply,
+                                                       &mNavOptions,
+                                                       NULL,
+                                                       mNavFilterUPP,
+                                                       0L);                                                    // User Data
+               
+               if ( (err != noErr) && (err != userCanceledErr) ) {
+                       m_path = "" ;
+                       return wxID_CANCEL ;
+               }
+
+               if (mNavReply.validRecord) {            // User chose a folder
+               
+                       FSSpec  folderInfo;
+                       FSSpec  outFileSpec ;
+                       AEDesc specDesc ;
+                       
+                       OSErr err = ::AECoerceDesc( &mNavReply.selection , typeFSS, &specDesc);
+                       if ( err != noErr ) {
+                               m_path = "" ;
+                               return wxID_CANCEL ;
+                       }                       
+                       folderInfo = **(FSSpec**) specDesc.dataHandle;
+                       if (specDesc.dataHandle != nil) {
+                               ::AEDisposeDesc(&specDesc);
+                       }
+
+//                     mNavReply.GetFileSpec(folderInfo);
+                       
+                               // The FSSpec from NavChooseFolder is NOT the file spec
+                               // for the folder. The parID field is actually the DirID
+                               // of the folder itself, not the folder's parent, and
+                               // the name field is empty. We must call PBGetCatInfo
+                               // to get the parent DirID and folder name
+                       
+                       Str255          name;
+                       CInfoPBRec      thePB;                  // Directory Info Parameter Block
+                       thePB.dirInfo.ioCompletion      = nil;
+                       thePB.dirInfo.ioVRefNum         = folderInfo.vRefNum;   // Volume is right
+                       thePB.dirInfo.ioDrDirID         = folderInfo.parID;             // Folder's DirID
+                       thePB.dirInfo.ioNamePtr         = name;
+                       thePB.dirInfo.ioFDirIndex       = -1;   // Lookup using Volume and DirID
+                       
+                       err = ::PBGetCatInfoSync(&thePB);
+                       if ( err != noErr ) {
+                               m_path = "" ;
+                               return wxID_CANCEL ;
+                       }                       
+                                                                                               // Create cannonical FSSpec
+                       ::FSMakeFSSpec(thePB.dirInfo.ioVRefNum, thePB.dirInfo.ioDrParID,
+                                                  name, &outFileSpec);
+                                                       
+                       // outFolderDirID = thePB.dirInfo.ioDrDirID;
+                       m_path = wxMacFSSpec2UnixFilename( &outFileSpec ) ;
+                       return wxID_OK ;
+               }
+               return wxID_CANCEL;
+

        }
        }

-       return wxID_CANCEL;

 }
 
 }