made Update be window local (before was updating the entire window), ScrollWindow...

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

diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index 5a65441f23848a40d30219aed320d939a04147d9..78658d4f92dd54977341e6ba93c44d837f724fdd 100644 (file)
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -26,7 +26,7 @@
 #endif
 
 #if !USE_SHARED_LIBRARY
 #endif
 
 #if !USE_SHARED_LIBRARY

-IMPLEMENT_CLASS(wxFileDialog, wxDialog)
+IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)

 #endif
 
 // begin wxmac
 #endif
 
 // begin wxmac


@@ -104,13 +104,12 @@ NavEventProc(
                 Str255 filename ;
                 // get the current filename
                 NavCustomControl(ioParams->context, kNavCtlGetEditFileName, &filename);
                 Str255 filename ;
                 // get the current filename
                 NavCustomControl(ioParams->context, kNavCtlGetEditFileName, &filename);

-                CopyPascalStringToC( filename , (char*) filename ) ;
-                wxString sfilename( filename ) ;
+                wxString sfilename = wxMacMakeStringFromPascal( filename ) ;

                 int pos = sfilename.Find('.',TRUE) ;
                 if ( pos != wxNOT_FOUND )
                 {
                     sfilename = sfilename.Left(pos+1)+extension ;
                 int pos = sfilename.Find('.',TRUE) ;
                 if ( pos != wxNOT_FOUND )
                 {
                     sfilename = sfilename.Left(pos+1)+extension ;

-                    CopyCStringToPascal( sfilename.c_str() , filename ) ;
+                    wxMacStringToPascal( sfilename , filename ) ;

                     NavCustomControl(ioParams->context, kNavCtlSetEditFileName, &filename);
                 }
             }
                     NavCustomControl(ioParams->context, kNavCtlSetEditFileName, &filename);
                 }
             }


@@ -118,11 +117,11 @@ NavEventProc(
     }
 }
 
     }
 }
 

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

 {
 {

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

     
     NULL 
 } ;
     
     NULL 
 } ;


@@ -162,7 +161,7 @@ void MakeUserDataRec(OpenUserDataRec    *myData , const wxString& filter )
                     ++filterIndex ;
                 }
                 isName = !isName ;
                     ++filterIndex ;
                 }
                 isName = !isName ;

-                current = "" ;
+                current = wxEmptyString ;

             }
             else
             {
             }
             else
             {


@@ -172,7 +171,7 @@ void MakeUserDataRec(OpenUserDataRec    *myData , const wxString& filter )
         // 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
         
         // 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" ) ;
+        wxASSERT_MSG( filterIndex == 0 || !isName , wxT("incorrect format of format string") ) ;

         if ( current.IsEmpty() )
             myData->extensions.Add( myData->name[filterIndex] ) ;
         else
         if ( current.IsEmpty() )
             myData->extensions.Add( myData->name[filterIndex] ) ;
         else


@@ -189,7 +188,7 @@ void MakeUserDataRec(OpenUserDataRec    *myData , const wxString& filter )
             int j ;
             for ( j = 0 ; gfilters[j] ; j++ )
             {
             int j ;
             for ( j = 0 ; gfilters[j] ; j++ )
             {

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

                 {
                     myData->filtermactypes.Add( gfiltersmac[j] ) ;
                     break ;
                 {
                     myData->filtermactypes.Add( gfiltersmac[j] ) ;
                     break ;


@@ -205,6 +204,7 @@ void MakeUserDataRec(OpenUserDataRec    *myData , const wxString& filter )
 
 static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecPtr data)
 {
 
 static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecPtr data)
 {

+/*

     Str255             filename ;
     
 #if TARGET_CARBON
     Str255             filename ;
     
 #if TARGET_CARBON


@@ -214,20 +214,22 @@ 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 )
     {
         //for ( int i = 0 ; i < data->numfilters ; ++i )
         int i = data->currentfilter ;
     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) == ".*" )
+        if ( data->extensions[i].Right(2) == wxT(".*") )

             return true ;
         
         {
             if ( type == (OSType)data->filtermactypes[i] )
                 return true ;
             
             return true ;
         
         {
             if ( type == (OSType)data->filtermactypes[i] )
                 return true ;
             

-            wxStringTokenizer tokenizer( data->extensions[i] , ";" ) ;
+            wxStringTokenizer tokenizer( data->extensions[i] , wxT(";") ) ;

             while( tokenizer.HasMoreTokens() )
             {
                 wxString extension = tokenizer.GetNextToken() ;
             while( tokenizer.HasMoreTokens() )
             {
                 wxString extension = tokenizer.GetNextToken() ;


@@ -272,81 +274,14 @@ static pascal Boolean CrossPlatformFileFilter(CInfoPBPtr myCInfoPBPtr, void *dat
 
 // end wxmac
 
 
 // end wxmac
 

-wxString wxFileSelector(const char *title,
-                     const char *defaultDir, const char *defaultFileName,
-                     const char *defaultExtension, const char *filter, int flags,
-                     wxWindow *parent, int x, int y)
-{
-    // If there's a default extension specified but no filter, we create a suitable
-    // filter.
-
-    wxString filter2("");
-    if ( defaultExtension && !filter )
-        filter2 = wxString("*.") + wxString(defaultExtension) ;
-    else if ( filter )
-        filter2 = filter;
-
-    wxString defaultDirString;
-    if (defaultDir)
-        defaultDirString = defaultDir;
-    else
-        defaultDirString = "";
-
-    wxString defaultFilenameString;
-    if (defaultFileName)
-        defaultFilenameString = defaultFileName;
-    else
-        defaultFilenameString = "";
-
-    wxFileDialog fileDialog(parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y));
-
-    if ( fileDialog.ShowModal() == wxID_OK )
-    {
-        return fileDialog.GetPath();
-    }
-    else
-        return wxGetEmptyString();
-}
-
-WXDLLEXPORT wxString wxFileSelectorEx(const char *title,
-                       const char *defaultDir,
-                       const char *defaultFileName,
-                       int* defaultFilterIndex,
-                       const char *filter,
-                       int       flags,
-                       wxWindow* parent,
-                       int       x,
-                       int       y)
-
-{
-    wxFileDialog fileDialog(parent, title ? title : "", defaultDir ? defaultDir : "",
-        defaultFileName ? defaultFileName : "", filter ? filter : "", flags, wxPoint(x, y));
-
-    if ( fileDialog.ShowModal() == wxID_OK )
-    {
-        *defaultFilterIndex = fileDialog.GetFilterIndex();
-        return fileDialog.GetPath();
-    }
-    else
-        return wxGetEmptyString();
-}
-

 wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
         const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,
         long style, const wxPoint& 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() , "Navigation Services are not running" ) ;
-    m_message = message;
-    m_dialogStyle = style;
-    m_parent = parent;
-    m_path = "";
-    m_fileName = defaultFileName;
-    m_dir = defaultDir;
-    m_wildCard = wildCard;
-    m_filterIndex = 0;
+    wxASSERT_MSG( NavServicesAvailable() , wxT("Navigation Services are not running") ) ;

 }
 
 }
 

-

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


@@ -417,19 +352,8 @@ int wxFileDialog::ShowModal()
             mNavOptions.dialogOptionFlags &= ~kNavSelectDefaultLocation;
         }
     }
             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
     
 
     // zero all data
     


@@ -450,12 +374,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 )


@@ -519,7 +438,7 @@ int wxFileDialog::ShowModal()
         {
             OSErr err = ::AEGetNthDesc( &mNavReply.selection , i , typeFSS, &keyWord , &specDesc);
             if ( err != noErr ) {
         {
             OSErr err = ::AEGetNthDesc( &mNavReply.selection , i , typeFSS, &keyWord , &specDesc);
             if ( err != noErr ) {

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

                 return wxID_CANCEL ;
             }            
             outFileSpec = **(FSSpec**) specDesc.dataHandle;
                 return wxID_CANCEL ;
             }            
             outFileSpec = **(FSSpec**) specDesc.dataHandle;


@@ -541,40 +460,3 @@ int wxFileDialog::ShowModal()
     return wxID_CANCEL;
 }
 
     return wxID_CANCEL;
 }
 

-// Generic file load/save dialog
-static wxString
-wxDefaultFileSelector(bool load, const char *what, const char *extension, const char *default_name, wxWindow *parent)
-{
-    char *ext = (char *)extension;
-    
-    char prompt[50];
-    wxString str;
-    if (load)
-        str = "Load %s file";
-    else
-        str = "Save %s file";
-    sprintf(prompt, wxGetTranslation(str), what);
-    
-    if (*ext == '.') ext++;
-    char wild[60];
-    sprintf(wild, "*.%s", ext);
-    
-    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)
-{
-    return wxDefaultFileSelector(TRUE, what, extension, default_name, parent);
-}
-
-
-// Generic file save dialog
-wxString
-wxSaveFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent)
-{
-    return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);
-}
-
-