removed superfluous casts

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

diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index 841dc9936a222a456ebc7121ae84d01a62d4a961..f2b6707baf85faf9bd0c4f6afbe7046a3f4c1d16 100644 (file)
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -52,160 +52,160 @@ extern bool gUseNavServices ;
 
 struct OpenUserDataRec {
   int           currentfilter ;
 
 struct OpenUserDataRec {
   int           currentfilter ;

-  bool                         saveMode ;
+  bool                saveMode ;

   wxArrayString      name ;
   wxArrayString      extensions ;
   wxArrayString      name ;
   wxArrayString      extensions ;

-  wxArrayLong          filtermactypes ;
+  wxArrayLong        filtermactypes ;

   NavMenuItemSpecArrayHandle menuitems ;
 };
 
 typedef struct OpenUserDataRec
   NavMenuItemSpecArrayHandle menuitems ;
 };
 
 typedef struct OpenUserDataRec

-       OpenUserDataRec, *OpenUserDataRecPtr;
+    OpenUserDataRec, *OpenUserDataRecPtr;

 
 

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

 
 #if TARGET_CARBON
 
 #if TARGET_CARBON

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

 #else
 #else

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

 #endif
 
 static pascal void
 NavEventProc(
 #endif
 
 static pascal void
 NavEventProc(

-       NavEventCallbackMessage         inSelector,
-       NavCBRecPtr                                     ioParams,
-       NavCallBackUserData     ioUserData      )
+    NavEventCallbackMessage        inSelector,
+    NavCBRecPtr                    ioParams,
+    NavCallBackUserData    ioUserData    )

 {
 {

-       OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ;
-       if (inSelector == kNavCBEvent) {        
+    OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ;
+    if (inSelector == kNavCBEvent) {    

 #if !TARGET_CARBON
          wxTheApp->MacHandleOneEvent(ioParams->eventData.eventDataParms.event);
 #endif
 #if !TARGET_CARBON
          wxTheApp->MacHandleOneEvent(ioParams->eventData.eventDataParms.event);
 #endif

-       } 
-       else if ( inSelector == kNavCBStart )
-       {
-               if ( data->menuitems )
-                       NavCustomControl(ioParams->context, kNavCtlSelectCustomType, &(*data->menuitems)[data->currentfilter]);
-       }
-       else if ( inSelector == kNavCBPopupMenuSelect )
-       {
-               NavMenuItemSpec * menu = (NavMenuItemSpec *) ioParams->eventData.eventDataParms.param ;
-               if ( menu->menuCreator == 'WXNG' )
-               {
-                       data->currentfilter = menu->menuType ;
-                       if ( data->saveMode )
-                       {
-                               int i = menu->menuType ;
-                               wxString extension =  data->extensions[i].AfterLast('.') ;
-                               extension.MakeLower() ;
-                               Str255 filename ;
-                               // get the current filename
-                               NavCustomControl(ioParams->context, kNavCtlGetEditFileName, &filename);
-                               CopyPascalStringToC( filename , (char*) filename ) ;
-                               wxString sfilename( filename ) ;
-                               int pos = sfilename.Find('.',TRUE) ;
-                               if ( pos != wxNOT_FOUND )
-                               {
-                                       sfilename = sfilename.Left(pos+1)+extension ;
-                                       CopyCStringToPascal( sfilename.c_str() , filename ) ;
-                                       NavCustomControl(ioParams->context, kNavCtlSetEditFileName, &filename);
-                               }
-                       }
-               }
-       }
+    } 
+    else if ( inSelector == kNavCBStart )
+    {
+        if ( data->menuitems )
+            NavCustomControl(ioParams->context, kNavCtlSelectCustomType, &(*data->menuitems)[data->currentfilter]);
+    }
+    else if ( inSelector == kNavCBPopupMenuSelect )
+    {
+        NavMenuItemSpec * menu = (NavMenuItemSpec *) ioParams->eventData.eventDataParms.param ;
+        if ( menu->menuCreator == 'WXNG' )
+        {
+            data->currentfilter = menu->menuType ;
+            if ( data->saveMode )
+            {
+                int i = menu->menuType ;
+                wxString extension =  data->extensions[i].AfterLast('.') ;
+                extension.MakeLower() ;
+                Str255 filename ;
+                // get the current filename
+                NavCustomControl(ioParams->context, kNavCtlGetEditFileName, &filename);
+                wxString sfilename = wxMacMakeStringFromPascal( filename ) ;
+                int pos = sfilename.Find('.',TRUE) ;
+                if ( pos != wxNOT_FOUND )
+                {
+                    sfilename = sfilename.Left(pos+1)+extension ;
+                    wxMacStringToPascal( sfilename , filename ) ;
+                    NavCustomControl(ioParams->context, kNavCtlSetEditFileName, &filename);
+                }
+            }
+          }
+    }

 }
 
 }
 

-const char * gfilters[] =
+const wxChar * gfilters[] =

 {
 {

-       "*.TXT" ,
-       "*.TIF" ,
-       "*.JPG" ,
-       
-       NULL 
+    wxT("*.TXT") ,
+    wxT("*.TIF") ,
+    wxT("*.JPG") ,
+    
+    NULL 

 } ;
 
 OSType gfiltersmac[] =
 {
 } ;
 
 OSType gfiltersmac[] =
 {

-       'TEXT' ,
-       'TIFF' ,
-       'JPEG' ,
-       
-       '****'
+    'TEXT' ,
+    'TIFF' ,
+    'JPEG' ,
+    
+    '****'

 } ;
 
 
 
 } ;
 
 
 

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

 {
 {

-       myData->menuitems = NULL ;
-       myData->currentfilter = 0 ;
-       myData->saveMode = FALSE ;
-       
-       if ( filter && filter[0] )
-       {
-         wxString filter2(filter) ;
-    int filterIndex = 0;
-    bool isName = true ;
-    wxString current ;
-    for( unsigned int i = 0; i < filter2.Len() ; i++ )
+    myData->menuitems = NULL ;
+    myData->currentfilter = 0 ;
+    myData->saveMode = FALSE ;
+    
+    if ( filter && filter[0] )

     {
     {

-       if( filter2.GetChar(i) == wxT('|') )
-       {
-        if( isName ) {
-          myData->name.Add( current ) ;
-        }
-        else {
-          myData->extensions.Add( current.MakeUpper() ) ;
-          ++filterIndex ;
+        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.Add( current ) ;
+                }
+                else {
+                    myData->extensions.Add( current.MakeUpper() ) ;
+                    ++filterIndex ;
+                }
+                isName = !isName ;
+                current = wxEmptyString ;
+            }
+            else
+            {
+                current += filter2.GetChar(i) ;
+            }

         }
         }

-        isName = !isName ;
-         current = "" ;
-       }
-       else
-       {
-        current += filter2.GetChar(i) ;
-       }
-    }
-    // we allow for compatibility reason to have a single filter expression (like *.*) without
-    // an explanatory text, in that case the first part is name and extension at the same time
-      
-    wxASSERT_MSG( filterIndex == 0 || !isName , "incorrect format of format string" ) ;
-    if ( current.IsEmpty() )
-        myData->extensions.Add( myData->name[filterIndex] ) ;
-    else
-        myData->extensions.Add( current.MakeUpper() ) ;
-    if ( filterIndex == 0 || isName )
-        myData->name.Add( current.MakeUpper() ) ;
+        // we allow for compatibility reason to have a single filter expression (like *.*) without
+        // 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() )
+            myData->extensions.Add( myData->name[filterIndex] ) ;
+        else
+            myData->extensions.Add( current.MakeUpper() ) ;
+        if ( filterIndex == 0 || isName )
+            myData->name.Add( current.MakeUpper() ) ;
+        
+        ++filterIndex ;
+        

         
         

-    ++filterIndex ;
-
-

         const size_t extCount = myData->extensions.GetCount();
         const size_t extCount = myData->extensions.GetCount();

-               for ( size_t i = 0 ; i < extCount; i++ )
-               {
-                       int j ;
-                       for ( j = 0 ; gfilters[j] ; j++ )
-                       {
-                               if ( strcmp( myData->extensions[i] , gfilters[j] ) == 0 )
-                               {
-                                   myData->filtermactypes.Add( gfiltersmac[j] ) ;
-                                       break ;
-                               }
-                       }
-                       if( gfilters[j] == NULL )
-                       {
-                               myData->filtermactypes.Add( '****' ) ;
-                       }
-               }
-       }
+        for ( size_t i = 0 ; i < extCount; i++ )
+        {
+            int j ;
+            for ( j = 0 ; gfilters[j] ; j++ )
+            {
+                if ( myData->extensions[i] == gfilters[j]  )
+                {
+                    myData->filtermactypes.Add( gfiltersmac[j] ) ;
+                    break ;
+                }
+            }
+            if( gfilters[j] == NULL )
+            {
+                myData->filtermactypes.Add( '****' ) ;
+            }
+        }
+    }

 }
 
 static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecPtr data)
 {
 }
 
 static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecPtr data)
 {

-    Str255                     filename ;
+/*
+    Str255             filename ;

     
 #if TARGET_CARBON
     p2cstrcpy((char *)filename, name) ;
     
 #if TARGET_CARBON
     p2cstrcpy((char *)filename, name) ;


@@ -214,75 +214,77 @@ static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecP
     p2cstr( filename ) ;
 #endif
     wxString file(filename) ;
     p2cstr( filename ) ;
 #endif
     wxString file(filename) ;

+*/
+       wxString file = wxMacMakeStringFromPascal( name ) ;

     file.MakeUpper() ;
     
     if ( data->extensions.GetCount() > 0 )
     {
     file.MakeUpper() ;
     
     if ( data->extensions.GetCount() > 0 )
     {

-       //for ( int i = 0 ; i < data->numfilters ; ++i )
-           int i = data->currentfilter ;
-           if ( data->extensions[i].Right(2) == ".*" )
-             return true ;
-       
-           {
-             if ( type == (OSType)data->filtermactypes[i] )
-                     return true ;
-           
-             wxStringTokenizer tokenizer( data->extensions[i] , ";" ) ;
-             while( tokenizer.HasMoreTokens() )
-             {
-               wxString extension = tokenizer.GetNextToken() ;
-             if ( extension.GetChar(0) == '*' )
-                     extension = extension.Mid(1) ;
-           
-             if ( file.Len() >= extension.Len() && extension == file.Right(extension.Len() ) )
-                     return true ;
-                   }
-           }
-           return false ;
+        //for ( int i = 0 ; i < data->numfilters ; ++i )
+        int i = data->currentfilter ;
+        if ( data->extensions[i].Right(2) == wxT(".*") )
+            return true ;
+        
+        {
+            if ( type == (OSType)data->filtermactypes[i] )
+                return true ;
+            
+            wxStringTokenizer tokenizer( data->extensions[i] , wxT(";") ) ;
+            while( tokenizer.HasMoreTokens() )
+            {
+                wxString extension = tokenizer.GetNextToken() ;
+                if ( extension.GetChar(0) == '*' )
+                    extension = extension.Mid(1) ;
+                
+                if ( file.Len() >= extension.Len() && extension == file.Right(extension.Len() ) )
+                    return true ;
+            }
+        }
+        return false ;

     }
     return true ;
 }
 
 #ifndef __DARWIN__
 static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr)
     }
     return true ;
 }
 
 #ifndef __DARWIN__
 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 )
-       {
-               return !CheckFile( myCInfoPBPtr->hFileInfo.ioNamePtr , myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdType , data ) ;
-       }       
-               
-       return false ;
+{    
+    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 )
+    {
+        return !CheckFile( myCInfoPBPtr->hFileInfo.ioNamePtr , myCInfoPBPtr->hFileInfo.ioFlFndrInfo.fdType , data ) ;
+    }    
+        
+    return false ;

 }
 #endif
 
 // end wxmac
 
 }
 #endif
 
 // end wxmac
 

-wxString wxFileSelector(const char *title,
-                     const char *defaultDir, const char *defaultFileName,
-                     const char *defaultExtension, const char *filter, int flags,
+wxString wxFileSelector(const wxChar *title,
+                     const wxChar *defaultDir, const wxChar *defaultFileName,
+                     const wxChar *defaultExtension, const wxChar *filter, int flags,

                      wxWindow *parent, int x, int y)
 {
     // If there's a default extension specified but no filter, we create a suitable
     // filter.
 
                      wxWindow *parent, int x, int y)
 {
     // If there's a default extension specified but no filter, we create a suitable
     // filter.
 

-    wxString filter2("");
+    wxString filter2;

     if ( defaultExtension && !filter )
     if ( defaultExtension && !filter )

-        filter2 = wxString("*.") + wxString(defaultExtension) ;
+        filter2 = wxString(wxT("*.")) + wxString(defaultExtension) ;

     else if ( filter )
         filter2 = filter;
 
     else if ( filter )
         filter2 = filter;
 


@@ -290,13 +292,13 @@ wxString wxFileSelector(const char *title,
     if (defaultDir)
         defaultDirString = defaultDir;
     else
     if (defaultDir)
         defaultDirString = defaultDir;
     else

-        defaultDirString = "";
+        defaultDirString = wxEmptyString ;

 
     wxString defaultFilenameString;
     if (defaultFileName)
         defaultFilenameString = defaultFileName;
     else
 
     wxString defaultFilenameString;
     if (defaultFileName)
         defaultFilenameString = defaultFileName;
     else

-        defaultFilenameString = "";
+        defaultFilenameString = wxEmptyString;

 
     wxFileDialog fileDialog(parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y));
 
 
     wxFileDialog fileDialog(parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y));
 


@@ -308,19 +310,19 @@ wxString wxFileSelector(const char *title,
         return wxGetEmptyString();
 }
 
         return wxGetEmptyString();
 }
 

-WXDLLEXPORT wxString wxFileSelectorEx(const char *title,
-                       const char *defaultDir,
-                       const char *defaultFileName,
+WXDLLEXPORT wxString wxFileSelectorEx(const wxChar *title,
+                       const wxChar *defaultDir,
+                       const wxChar *defaultFileName,

                        int* defaultFilterIndex,
                        int* defaultFilterIndex,

-                       const char *filter,
+                       const wxChar *filter,

                        int       flags,
                        wxWindow* parent,
                        int       x,
                        int       y)
 
 {
                        int       flags,
                        wxWindow* parent,
                        int       x,
                        int       y)
 
 {

-    wxFileDialog fileDialog(parent, title ? title : "", defaultDir ? defaultDir : "",
-        defaultFileName ? defaultFileName : "", filter ? filter : "", flags, wxPoint(x, y));
+    wxFileDialog fileDialog(parent, title ? title : wxT(""), defaultDir ? defaultDir : wxT(""),
+        defaultFileName ? defaultFileName : wxT(""), filter ? filter : wxT(""), flags, wxPoint(x, y));

 
     if ( fileDialog.ShowModal() == wxID_OK )
     {
 
     if ( fileDialog.ShowModal() == wxID_OK )
     {


@@ -335,18 +337,17 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
         const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,
         long style, const wxPoint& pos)
 {
         const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,
         long style, const wxPoint& pos)
 {

-       wxASSERT_MSG( NavServicesAvailable() , "Navigation Services are not running" ) ;
+    wxASSERT_MSG( NavServicesAvailable() , wxT("Navigation Services are not running") ) ;

     m_message = message;
     m_dialogStyle = style;
     m_parent = parent;
     m_message = message;
     m_dialogStyle = style;
     m_parent = parent;

-    m_path = "";
+    m_path = wxT("");

     m_fileName = defaultFileName;
     m_dir = defaultDir;
     m_wildCard = wildCard;
     m_filterIndex = 0;
 }
 
     m_fileName = defaultFileName;
     m_dir = defaultDir;
     m_wildCard = wildCard;
     m_filterIndex = 0;
 }
 

-

 pascal Boolean CrossPlatformFilterCallback (
     AEDesc *theItem, 
     void *info, 
 pascal Boolean CrossPlatformFilterCallback (
     AEDesc *theItem, 
     void *info, 


@@ -362,7 +363,7 @@ pascal Boolean CrossPlatformFilterCallback (
         NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ;
         if (theItem->descriptorType == typeFSS && !theInfo->isFolder)
         {
         NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ;
         if (theItem->descriptorType == typeFSS && !theInfo->isFolder)
         {

-            FSSpec     spec;
+            FSSpec    spec;

             memcpy( &spec , *theItem->dataHandle , sizeof(FSSpec) ) ;
             display = CheckFile( spec.name , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
         }
             memcpy( &spec , *theItem->dataHandle , sizeof(FSSpec) ) ;
             display = CheckFile( spec.name , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
         }


@@ -373,72 +374,61 @@ pascal Boolean CrossPlatformFilterCallback (
 
 int wxFileDialog::ShowModal()
 {
 
 int wxFileDialog::ShowModal()
 {

-    NavDialogOptions          mNavOptions;
-    NavObjectFilterUPP        mNavFilterUPP = NULL;
-    NavPreviewUPP             mNavPreviewUPP = NULL ;
-    NavReplyRecord            mNavReply;
-    AEDesc                    mDefaultLocation ;
-    bool                      mSelectDefault = false ;
-               
-       // zero all data
-       
-       m_path = wxEmptyString ;
-       m_fileName = wxEmptyString ;
-       m_paths.Empty();
-       m_fileNames.Empty();
-
-       // setup dialog
-               
+    NavDialogOptions           mNavOptions;
+    NavObjectFilterUPP           mNavFilterUPP = NULL;
+    NavPreviewUPP           mNavPreviewUPP = NULL ;
+    NavReplyRecord           mNavReply;
+    AEDesc               mDefaultLocation ;
+    bool               mSelectDefault = false ;
+        
+    // setup dialog
+        

     ::NavGetDefaultDialogOptions(&mNavOptions);
     ::NavGetDefaultDialogOptions(&mNavOptions);

-       
-    mNavFilterUPP      = nil;
-    mNavPreviewUPP     = nil;
-    mSelectDefault     = false;
+    
+    mNavFilterUPP    = nil;
+    mNavPreviewUPP    = nil;
+    mSelectDefault    = false;

     mNavReply.validRecord              = false;
     mNavReply.validRecord              = false;

-    mNavReply.replacing                       = false;
+    mNavReply.replacing                   = false;

     mNavReply.isStationery             = false;
     mNavReply.isStationery             = false;

-    mNavReply.translationNeeded               = false;
+    mNavReply.translationNeeded           = false;

     mNavReply.selection.descriptorType = typeNull;
     mNavReply.selection.dataHandle     = nil;
     mNavReply.selection.descriptorType = typeNull;
     mNavReply.selection.dataHandle     = nil;

-    mNavReply.keyScript                       = smSystemScript;
+    mNavReply.keyScript                   = smSystemScript;

     mNavReply.fileTranslation          = nil;
     mNavReply.fileTranslation          = nil;

-               
+        

     // Set default location, the location
     //   that's displayed when the dialog
     //   first appears
     // Set default location, the location
     //   that's displayed when the dialog
     //   first appears

-               
+        

     FSSpec location ;
     wxMacFilename2FSSpec( m_dir , &location ) ;
     OSErr err = noErr ;
     FSSpec location ;
     wxMacFilename2FSSpec( m_dir , &location ) ;
     OSErr err = noErr ;

-               
+        

     mDefaultLocation.descriptorType = typeNull;
     mDefaultLocation.dataHandle     = nil;
 
     err = ::AECreateDesc(typeFSS, &location, sizeof(FSSpec), &mDefaultLocation );
 
     if ( mDefaultLocation.dataHandle ) {
     mDefaultLocation.descriptorType = typeNull;
     mDefaultLocation.dataHandle     = nil;
 
     err = ::AECreateDesc(typeFSS, &location, sizeof(FSSpec), &mDefaultLocation );
 
     if ( mDefaultLocation.dataHandle ) {

-                       
+            

         if (mSelectDefault) {
             mNavOptions.dialogOptionFlags |= kNavSelectDefaultLocation;
         } else {
             mNavOptions.dialogOptionFlags &= ~kNavSelectDefaultLocation;
         }
     }
         if (mSelectDefault) {
             mNavOptions.dialogOptionFlags |= kNavSelectDefaultLocation;
         } else {
             mNavOptions.dialogOptionFlags &= ~kNavSelectDefaultLocation;
         }
     }

-               
-#if TARGET_CARBON
-    c2pstrcpy((StringPtr)mNavOptions.message, m_message) ;
-#else
-    strcpy((char *)mNavOptions.message, m_message) ;
-    c2pstr((char *)mNavOptions.message ) ;
-#endif
-#if TARGET_CARBON
-    c2pstrcpy((StringPtr)mNavOptions.savedFileName, m_fileName) ;
-#else
-    strcpy((char *)mNavOptions.savedFileName, m_fileName) ;
-    c2pstr((char *)mNavOptions.savedFileName ) ;
-#endif
+    wxMacStringToPascal( m_message , (StringPtr)mNavOptions.message ) ;
+    wxMacStringToPascal( m_fileName , (StringPtr)mNavOptions.savedFileName ) ;
+
+    // zero all data
+    
+    m_path = wxEmptyString ;
+    m_fileName = wxEmptyString ;
+    m_paths.Empty();
+    m_fileNames.Empty();

 
 

-    OpenUserDataRec                    myData;
+    OpenUserDataRec            myData;

     MakeUserDataRec( &myData , m_wildCard ) ;
     myData.currentfilter = m_filterIndex ;
     if ( myData.extensions.GetCount() > 0 )
     MakeUserDataRec( &myData , m_wildCard ) ;
     myData.currentfilter = m_filterIndex ;
     if ( myData.extensions.GetCount() > 0 )


@@ -450,12 +440,7 @@ int wxFileDialog::ShowModal()
             (*mNavOptions.popupExtension)[i].version     = kNavMenuItemSpecVersion ;
             (*mNavOptions.popupExtension)[i].menuCreator = 'WXNG' ;
             (*mNavOptions.popupExtension)[i].menuType    = 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
+            wxMacStringToPascal( myData.name[i] , (StringPtr)(*mNavOptions.popupExtension)[i].menuItemName ) ;

         }
     }
     if ( m_dialogStyle & wxSAVE )
         }
     }
     if ( m_dialogStyle & wxSAVE )


@@ -464,7 +449,7 @@ int wxFileDialog::ShowModal()
 
         mNavOptions.dialogOptionFlags |= kNavDontAutoTranslate ;
         mNavOptions.dialogOptionFlags |= kNavDontAddTranslateItems ;
 
         mNavOptions.dialogOptionFlags |= kNavDontAutoTranslate ;
         mNavOptions.dialogOptionFlags |= kNavDontAddTranslateItems ;

-                       
+            

         err = ::NavPutFile(
                            &mDefaultLocation,
                            &mNavReply,
         err = ::NavPutFile(
                            &mDefaultLocation,
                            &mNavReply,


@@ -472,7 +457,7 @@ int wxFileDialog::ShowModal()
                            sStandardNavEventFilter ,
                            NULL,
                            kNavGenericSignature,
                            sStandardNavEventFilter ,
                            NULL,
                            kNavGenericSignature,

-                           &myData);                                   // User Data
+                           &myData);                    // User Data

         m_filterIndex = myData.currentfilter ;
     }
     else
         m_filterIndex = myData.currentfilter ;
     }
     else


@@ -484,7 +469,7 @@ int wxFileDialog::ShowModal()
             mNavOptions.dialogOptionFlags |= kNavAllowMultipleFiles ;
         else
             mNavOptions.dialogOptionFlags &= ~kNavAllowMultipleFiles ;
             mNavOptions.dialogOptionFlags |= kNavAllowMultipleFiles ;
         else
             mNavOptions.dialogOptionFlags &= ~kNavAllowMultipleFiles ;

-                       
+            

         err = ::NavGetFile(
                            &mDefaultLocation,
                            &mNavReply,
         err = ::NavGetFile(
                            &mDefaultLocation,
                            &mNavReply,


@@ -496,32 +481,32 @@ int wxFileDialog::ShowModal()
                            &myData);
         m_filterIndex = myData.currentfilter ;
     }
                            &myData);
         m_filterIndex = myData.currentfilter ;
     }

-               
+        

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

-               
+        

     if ( (err != noErr) && (err != userCanceledErr) ) {
         return wxID_CANCEL ;
     }
 
     if (mNavReply.validRecord) {
     if ( (err != noErr) && (err != userCanceledErr) ) {
         return wxID_CANCEL ;
     }
 
     if (mNavReply.validRecord) {

-               
+        

         FSSpec  outFileSpec ;
         AEDesc specDesc ;
         AEKeyword keyWord ;
         FSSpec  outFileSpec ;
         AEDesc specDesc ;
         AEKeyword keyWord ;

-                       
+            

         long count ;
         ::AECountItems( &mNavReply.selection , &count ) ;
         for ( long i = 1 ; i <= count ; ++i )
         {
             OSErr err = ::AEGetNthDesc( &mNavReply.selection , i , typeFSS, &keyWord , &specDesc);
             if ( err != noErr ) {
         long count ;
         ::AECountItems( &mNavReply.selection , &count ) ;
         for ( long i = 1 ; i <= count ; ++i )
         {
             OSErr err = ::AEGetNthDesc( &mNavReply.selection , i , typeFSS, &keyWord , &specDesc);
             if ( err != noErr ) {

-                m_path = "" ;
+                m_path = wxT("") ;

                 return wxID_CANCEL ;
                 return wxID_CANCEL ;

-            }                  
+            }            

             outFileSpec = **(FSSpec**) specDesc.dataHandle;
             if (specDesc.dataHandle != nil) {
                 ::AEDisposeDesc(&specDesc);
             outFileSpec = **(FSSpec**) specDesc.dataHandle;
             if (specDesc.dataHandle != nil) {
                 ::AEDisposeDesc(&specDesc);


@@ -543,38 +528,38 @@ int wxFileDialog::ShowModal()
 
 // Generic file load/save dialog
 static wxString
 
 // Generic file load/save dialog
 static wxString

-wxDefaultFileSelector(bool load, const char *what, const char *extension, const char *default_name, wxWindow *parent)
+wxDefaultFileSelector(bool load, const wxChar *what, const wxChar *extension, const wxChar *default_name, wxWindow *parent)

 {
 {

-    char *ext = (char *)extension;
-    
-    char prompt[50];
+    wxString prompt;
+

     wxString str;
     if (load)
     wxString str;
     if (load)

-        str = "Load %s file";
+        str = wxT("Load %s file");

     else
     else

-        str = "Save %s file";
-    sprintf(prompt, wxGetTranslation(str), what);
+        str = wxT("Save %s file");
+    prompt.Printf( wxGetTranslation(str), what);

     
     

-    if (*ext == '.') ext++;
-    char wild[60];
-    sprintf(wild, "*.%s", ext);
+    const wxChar *ext = extension;
+    if (*ext == wxT('.'))
+        ext++;
+
+    wxString wild;
+    wild.Printf(wxT("*.%s"), ext);

     
     return wxFileSelector (prompt, NULL, default_name, ext, wild, 0, parent);
 }
 
 // Generic file load dialog
 wxString
     
     return wxFileSelector (prompt, NULL, default_name, ext, wild, 0, parent);
 }
 
 // Generic file load dialog
 wxString

-wxLoadFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent)
+wxLoadFileSelector(const wxChar *what, const wxChar *extension, const wxChar *default_name, wxWindow *parent)

 {
 {

-  return wxDefaultFileSelector(TRUE, what, extension, default_name, parent);
+    return wxDefaultFileSelector(TRUE, what, extension, default_name, parent);

 }
 
 
 // Generic file save dialog
 wxString
 }
 
 
 // Generic file save dialog
 wxString

-wxSaveFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent)
+wxSaveFileSelector(const wxChar *what, const wxChar *extension, const wxChar *default_name, wxWindow *parent)

 {
 {

-  return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);
+    return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);

 }
 }

-
-