no changes, just corrected the comment for wxConvLocal

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

diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index fc125d5921c6787771d420ac20a7d1cc1692b38c..5e129eaf9119f5e1a75fc228b96fae8fb03376d1 100644 (file)
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "filedlg.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #include "wx/app.h"
 #include "wx/wxprec.h"
 
 #include "wx/app.h"


@@ -23,23 +19,18 @@
 #include "wx/tokenzr.h"
 #include "wx/filename.h"
 
 #include "wx/tokenzr.h"
 #include "wx/filename.h"
 

-#ifndef __DARWIN__
-  #include "PLStringFuncs.h"
-#endif
-
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
-#endif
-
-// begin wxmac
-

 #include "wx/mac/private.h"
 
 #include "wx/mac/private.h"
 

-#include <Navigation.h>
+#ifndef __DARWIN__
+   #include <Navigation.h>
+   #include "PLStringFuncs.h"
+#endif

 
 #include "MoreFilesX.h"
 
 
 #include "MoreFilesX.h"
 

-extern bool gUseNavServices ;
+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
 
 // the data we need to pass to our standard file hook routine
 // includes a pointer to the dialog, a pointer to the standard


@@ -47,7 +38,8 @@ extern bool gUseNavServices ;
 // and a copy of the "previous" file spec of the reply record
 // so we can see if the selection has changed
 
 // and a copy of the "previous" file spec of the reply record
 // so we can see if the selection has changed
 

-struct OpenUserDataRec {
+struct OpenUserDataRec
+{

   int                currentfilter ;
   bool               saveMode ;
   wxArrayString      name ;
   int                currentfilter ;
   bool               saveMode ;
   wxArrayString      name ;


@@ -60,21 +52,21 @@ struct OpenUserDataRec {
 typedef struct OpenUserDataRec
 OpenUserDataRec, *OpenUserDataRecPtr;
 
 typedef struct OpenUserDataRec
 OpenUserDataRec, *OpenUserDataRecPtr;
 

-static pascal void    NavEventProc(
-                                NavEventCallbackMessage        inSelector,
-                                NavCBRecPtr                    ioParams,
-                                NavCallBackUserData            ioUserData);
+static pascal void NavEventProc(
+    NavEventCallbackMessage inSelector,
+    NavCBRecPtr ioParams,
+    NavCallBackUserData ioUserData );

 
 

-static NavEventUPP    sStandardNavEventFilter = NewNavEventUPP(NavEventProc);
+static NavEventUPP sStandardNavEventFilter = NewNavEventUPP(NavEventProc);

 
 

-static pascal void
-NavEventProc(
-    NavEventCallbackMessage        inSelector,
-    NavCBRecPtr                    ioParams,
-    NavCallBackUserData    ioUserData    )
+static pascal void NavEventProc(
+    NavEventCallbackMessage inSelector,
+    NavCBRecPtr ioParams,
+    NavCallBackUserData ioUserData )

 {
     OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ;
 {
     OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ;

-    if (inSelector == kNavCBEvent) {
+    if (inSelector == kNavCBEvent)
+    {

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


@@ -84,7 +76,7 @@ NavEventProc(
             // Apple Technical Q&A 1151
             FSSpec theFSSpec;
             wxMacFilename2FSSpec(data->defaultLocation, &theFSSpec);
             // Apple Technical Q&A 1151
             FSSpec theFSSpec;
             wxMacFilename2FSSpec(data->defaultLocation, &theFSSpec);

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

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


@@ -126,8 +118,7 @@ NavEventProc(
     }
 }
 
     }
 }
 

-
-void MakeUserDataRec(OpenUserDataRec    *myData , const wxString& filter )
+void MakeUserDataRec(OpenUserDataRec *myData , const wxString& filter )

 {
     myData->menuitems = NULL ;
     myData->currentfilter = 0 ;
 {
     myData->menuitems = NULL ;
     myData->currentfilter = 0 ;


@@ -139,17 +130,21 @@ void MakeUserDataRec(OpenUserDataRec    *myData , const wxString& filter )
         int filterIndex = 0;
         bool isName = true ;
         wxString current ;
         int filterIndex = 0;
         bool isName = true ;
         wxString current ;

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

         {
         {

-            if( filter2.GetChar(i) == wxT('|') )
+            if ( filter2.GetChar(i) == wxT('|') )

             {
             {

-                if( isName ) {
+                if ( isName )
+                {

                     myData->name.Add( current ) ;
                 }
                     myData->name.Add( current ) ;
                 }

-                else {
+                else
+                {

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

+

                 isName = !isName ;
                 current = wxEmptyString ;
             }
                 isName = !isName ;
                 current = wxEmptyString ;
             }


@@ -174,26 +169,21 @@ void MakeUserDataRec(OpenUserDataRec    *myData , const wxString& filter )
         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++ )
         {

-            wxUint32 fileType;
-            wxUint32 creator;
+            wxUint32 fileType, creator;

             wxString extension = myData->extensions[i];
 
             wxString extension = myData->extensions[i];
 

-            if (extension.GetChar(0) == '*')
-                extension = extension.Mid(1);  // Remove leading *
+            // Remove leading '*'
+            if (extension.length() && (extension.GetChar(0) == '*'))
+                extension = extension.Mid( 1 );

 
 

-            if (extension.GetChar(0) == '.')
-            {
-                extension = extension.Mid(1);  // Remove leading .
-            }
+            // Remove leading '.'
+            if (extension.length() && (extension.GetChar(0) == '.'))
+                extension = extension.Mid( 1 );

        
             if (wxFileName::MacFindDefaultTypeAndCreator( extension, &fileType, &creator ))
        
             if (wxFileName::MacFindDefaultTypeAndCreator( extension, &fileType, &creator ))

-            {

                 myData->filtermactypes.Add( (OSType)fileType );
                 myData->filtermactypes.Add( (OSType)fileType );

-            }

             else
             else

-            {
-                myData->filtermactypes.Add( '****' ) ;         // We'll fail safe if it's not recognized
-               }
+                myData->filtermactypes.Add( '****' ); // We'll fail safe if it's not recognized

         }
     }
 }
         }
     }
 }


@@ -215,7 +205,7 @@ static Boolean CheckFile( const wxString &filename , OSType type , OpenUserDataR
                 return true ;
 
             wxStringTokenizer tokenizer( data->extensions[i] , wxT(";") ) ;
                 return true ;
 
             wxStringTokenizer tokenizer( data->extensions[i] , wxT(";") ) ;

-            while( tokenizer.HasMoreTokens() )
+            while ( tokenizer.HasMoreTokens() )

             {
                 wxString extension = tokenizer.GetNextToken() ;
                 if ( extension.GetChar(0) == '*' )
             {
                 wxString extension = tokenizer.GetNextToken() ;
                 if ( extension.GetChar(0) == '*' )


@@ -225,8 +215,10 @@ static Boolean CheckFile( const wxString &filename , OSType type , OpenUserDataR
                     return true ;
             }
         }
                     return true ;
             }
         }

+

         return false ;
     }
         return false ;
     }

+

     return true ;
 }
 
     return true ;
 }
 


@@ -260,20 +252,20 @@ static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dat
 
 // end wxmac
 
 
 // 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)
+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)

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

-pascal Boolean CrossPlatformFilterCallback (
+pascal Boolean CrossPlatformFilterCallback(

     AEDesc *theItem,
     void *info,
     void *callBackUD,
     AEDesc *theItem,
     void *info,
     void *callBackUD,

-    NavFilterModes filterMode
-)
+    NavFilterModes filterMode )

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


@@ -283,7 +275,7 @@ pascal Boolean CrossPlatformFilterCallback (
         NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ;
         if ( !theInfo->isFolder )
         {
         NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ;
         if ( !theInfo->isFolder )
         {

-            if (theItem->descriptorType == typeFSS )
+            if (theItem->descriptorType == typeFSS)

             {
                 FSSpec    spec;
                 memcpy( &spec , *theItem->dataHandle , sizeof(FSSpec) ) ;
             {
                 FSSpec    spec;
                 memcpy( &spec , *theItem->dataHandle , sizeof(FSSpec) ) ;


@@ -307,6 +299,7 @@ int wxFileDialog::ShowModal()
 {
     OSErr err;
     NavDialogCreationOptions dialogCreateOptions;
 {
     OSErr err;
     NavDialogCreationOptions dialogCreateOptions;

+

     // set default options
     ::NavGetDefaultDialogCreationOptions(&dialogCreateOptions);
 
     // set default options
     ::NavGetDefaultDialogCreationOptions(&dialogCreateOptions);
 


@@ -345,12 +338,10 @@ int wxFileDialog::ShowModal()
     {
         myData.saveMode = true;
 
     {
         myData.saveMode = true;
 

-        if (!numFilters)
-        {
-            dialogCreateOptions.optionFlags |= kNavNoTypePopup;
-        }

         dialogCreateOptions.optionFlags |= kNavDontAutoTranslate;
         dialogCreateOptions.optionFlags |= kNavDontAddTranslateItems;
         dialogCreateOptions.optionFlags |= kNavDontAutoTranslate;
         dialogCreateOptions.optionFlags |= kNavDontAddTranslateItems;

+        if (!numFilters)
+            dialogCreateOptions.optionFlags |= kNavNoTypePopup;

 
         // The extension is important
         if (numFilters < 2)
 
         // The extension is important
         if (numFilters < 2)


@@ -358,31 +349,31 @@ int wxFileDialog::ShowModal()
 
 #if TARGET_API_MAC_OSX
         if (!(m_dialogStyle & wxOVERWRITE_PROMPT))
 
 #if TARGET_API_MAC_OSX
         if (!(m_dialogStyle & wxOVERWRITE_PROMPT))

-        {
-               dialogCreateOptions.optionFlags |= kNavDontConfirmReplacement;
-        }
+            dialogCreateOptions.optionFlags |= kNavDontConfirmReplacement;

 #endif
 #endif

-        err = ::NavCreatePutFileDialog(&dialogCreateOptions,
-                                       // Suppresses the 'Default' (top) menu item
-                                       kNavGenericSignature, kNavGenericSignature,
-                                       sStandardNavEventFilter,
-                                       &myData, // for defaultLocation
-                                       &dialog);
+
+        err = ::NavCreatePutFileDialog(
+            &dialogCreateOptions,
+            kNavGenericSignature, // Suppresses the 'Default' (top) menu item
+            kNavGenericSignature,
+            sStandardNavEventFilter,
+            &myData, // for defaultLocation
+            &dialog );

     }
     else
     {
     }
     else
     {

-    
-        //let people select bundles/programs in dialogs
+        // let the user select bundles/programs in dialogs

         dialogCreateOptions.optionFlags |= kNavSupportPackages;
     
         navFilterUPP = NewNavObjectFilterUPP(CrossPlatformFilterCallback);
         dialogCreateOptions.optionFlags |= kNavSupportPackages;
     
         navFilterUPP = NewNavObjectFilterUPP(CrossPlatformFilterCallback);

-        err = ::NavCreateGetFileDialog(&dialogCreateOptions,
-                                       NULL, // NavTypeListHandle
-                                       sStandardNavEventFilter,
-                                       NULL, // NavPreviewUPP
-                                       navFilterUPP,
-                                       (void *) &myData, // inClientData
-                                       &dialog);
+        err = ::NavCreateGetFileDialog(
+            &dialogCreateOptions,
+            NULL, // NavTypeListHandle
+            sStandardNavEventFilter,
+            NULL, // NavPreviewUPP
+            navFilterUPP,
+            (void *) &myData, // inClientData
+            &dialog );

     }
 
     if (err == noErr)
     }
 
     if (err == noErr)


@@ -406,38 +397,41 @@ int wxFileDialog::ShowModal()
         Size        actualSize;
         FSRef       theFSRef;
         wxString thePath ;
         Size        actualSize;
         FSRef       theFSRef;
         wxString thePath ;

-
-        m_filterIndex = myData.currentfilter ;
-

         long count;
         long count;

-        ::AECountItems(&navReply.selection , &count);
+
+        m_filterIndex = myData.currentfilter;
+        ::AECountItems( &navReply.selection, &count );

         for (long i = 1; i <= count; ++i)
         {
         for (long i = 1; i <= count; ++i)
         {

-            err = ::AEGetNthPtr(&(navReply.selection), i, typeFSRef, &theKeyword, &actualType,
-                                &theFSRef, sizeof(theFSRef), &actualSize);
+            err = ::AEGetNthPtr(
+                &(navReply.selection), i, typeFSRef, &theKeyword, &actualType,
+                &theFSRef, sizeof(theFSRef), &actualSize );

             if (err != noErr)
                 break;
 
             if (m_dialogStyle & wxSAVE)
             if (err != noErr)
                 break;
 
             if (m_dialogStyle & wxSAVE)

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

             else
             else

-                thePath = wxMacFSRefToPath( &theFSRef ) ;
+                thePath = wxMacFSRefToPath( &theFSRef );

                 
             if (!thePath)
             {
                 ::NavDisposeReply(&navReply);
                 return wxID_CANCEL;
             }
                 
             if (!thePath)
             {
                 ::NavDisposeReply(&navReply);
                 return wxID_CANCEL;
             }

+

             m_path = thePath;
             m_paths.Add(m_path);
             m_fileName = wxFileNameFromPath(m_path);
             m_fileNames.Add(m_fileName);
         }
             m_path = thePath;
             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);
     }
         // set these to the first hit
         m_path = m_paths[0];
         m_fileName = wxFileNameFromPath(m_path);
         m_dir = wxPathOnly(m_path);
     }

+

     ::NavDisposeReply(&navReply);
 
     return (err == noErr) ? wxID_OK : wxID_CANCEL;
     ::NavDisposeReply(&navReply);
 
     return (err == noErr) ? wxID_OK : wxID_CANCEL;