fixed MSVC6 warning

[wxWidgets.git] / src / common / filename.cpp

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 17218d98d3b166de83305c8cf2382bd42d7d5725..83731a291ab6ee7c598095510924d660df00f6b9 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -47,7 +47,7 @@
                 Note that VMS uses different separators unlike Unix:
                  : always after the device. If the path does not contain : than
                    the default (the device of the current directory) is assumed.
                 Note that VMS uses different separators unlike Unix:
                  : always after the device. If the path does not contain : than
                    the default (the device of the current directory) is assumed.

-                 [ start of directory specyfication
+                 [ start of directory specification

                  . separator between directory and subdirectory
                  ] between directory and file
  */
                  . separator between directory and subdirectory
                  ] between directory and file
  */


@@ -677,7 +677,7 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp)
     else // mkstemp() succeeded
     {
         path = wxConvFile.cMB2WX( (const char*) buf );
     else // mkstemp() succeeded
     {
         path = wxConvFile.cMB2WX( (const char*) buf );

-        
+

         // avoid leaking the fd
         if ( fileTemp )
         {
         // avoid leaking the fd
         if ( fileTemp )
         {


@@ -794,12 +794,12 @@ bool wxFileName::Mkdir( const wxString& dir, int perm, int flags )
         size_t count = dirs.GetCount();
         for ( size_t i = 0; i < count; i++ )
         {
         size_t count = dirs.GetCount();
         for ( size_t i = 0; i < count; i++ )
         {

-            if ( i > 0 || 
+            if ( i > 0 ||

 #if defined(__WXMAC__) && !defined(__DARWIN__)
 #if defined(__WXMAC__) && !defined(__DARWIN__)

-                       // relative pathnames are exactely the other way round under mac...
-               !filename.IsAbsolute() 
+            // relative pathnames are exactely the other way round under mac...
+                !filename.IsAbsolute()

 #else
 #else

-               filename.IsAbsolute() 
+                filename.IsAbsolute()

 #endif
             )
                 currPath += wxFILE_SEP_PATH;
 #endif
             )
                 currPath += wxFILE_SEP_PATH;


@@ -951,7 +951,7 @@ bool wxFileName::Normalize(int flags,
 
         m_dirs.Add(dir);
     }
 
         m_dirs.Add(dir);
     }

-    
+

 #if defined(__WIN32__) && !defined(__WXWINCE__) && wxUSE_OLE
     if ( (flags & wxPATH_NORM_SHORTCUT) )
     {
 #if defined(__WIN32__) && !defined(__WXWINCE__) && wxUSE_OLE
     if ( (flags & wxPATH_NORM_SHORTCUT) )
     {


@@ -1021,49 +1021,49 @@ bool wxFileName::GetShortcutTarget(const wxString& shortcutPath, wxString& targe
 {
     wxString path, file, ext;
     wxSplitPath(shortcutPath, & path, & file, & ext);
 {
     wxString path, file, ext;
     wxSplitPath(shortcutPath, & path, & file, & ext);

-    
-       HRESULT hres;   
-       IShellLink* psl;
-    bool success = FALSE;
+
+    HRESULT hres;
+    IShellLink* psl;
+    bool success = false;

 
     // Assume it's not a shortcut if it doesn't end with lnk
     if (ext.Lower() != wxT("lnk"))
 
     // Assume it's not a shortcut if it doesn't end with lnk
     if (ext.Lower() != wxT("lnk"))

-        return FALSE;
-    
-       // create a ShellLink object
-       hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
-                               IID_IShellLink, (LPVOID*) &psl);
-       
-       if (SUCCEEDED(hres))
-       {
-               IPersistFile* ppf;
-               hres = psl->QueryInterface( IID_IPersistFile, (LPVOID *) &ppf);
-               if (SUCCEEDED(hres))
-               {
-                       WCHAR wsz[MAX_PATH];
-
-                       MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, shortcutPath.mb_str(), -1, wsz,
-                MAX_PATH);
-                       
-                       hres = ppf->Load(wsz, 0);                       
-                       if (SUCCEEDED(hres))
-                       {
+        return false;
+
+    // create a ShellLink object
+    hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
+                            IID_IShellLink, (LPVOID*) &psl);
+
+    if (SUCCEEDED(hres))
+    {
+        IPersistFile* ppf;
+        hres = psl->QueryInterface( IID_IPersistFile, (LPVOID *) &ppf);
+        if (SUCCEEDED(hres))
+        {
+            WCHAR wsz[MAX_PATH];
+
+            MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, shortcutPath.mb_str(), -1, wsz,
+                                MAX_PATH);
+
+            hres = ppf->Load(wsz, 0);
+            if (SUCCEEDED(hres))
+            {

                 wxChar buf[2048];
                 wxChar buf[2048];

-                               psl->GetPath(buf, 2048, NULL, SLGP_UNCPRIORITY);
-                               targetFilename = wxString(buf);
+                psl->GetPath(buf, 2048, NULL, SLGP_UNCPRIORITY);
+                targetFilename = wxString(buf);

                 success = (shortcutPath != targetFilename);
 
                 success = (shortcutPath != targetFilename);
 

-                               psl->GetArguments(buf, 2048);
+                psl->GetArguments(buf, 2048);

                 wxString args(buf);
                 if (!args.IsEmpty() && arguments)
                 {
                     *arguments = args;
                 wxString args(buf);
                 if (!args.IsEmpty() && arguments)
                 {
                     *arguments = args;

-                }                
-                       }
-               }
-       }
-       psl->Release();
-       return success;
+                }
+            }
+        }
+    }
+    psl->Release();
+    return success;

 }
 #endif
 
 }
 #endif
 


@@ -2031,31 +2031,44 @@ static void MacEnsureDefaultExtensionsLoaded()
         gMacDefaultExtensionsInited = true ;
     }
 }
         gMacDefaultExtensionsInited = true ;
     }
 }

+

 bool wxFileName::MacSetTypeAndCreator( wxUint32 type , wxUint32 creator )
 {
 bool wxFileName::MacSetTypeAndCreator( wxUint32 type , wxUint32 creator )
 {

-  FInfo fndrInfo ;
-  FSSpec spec ;
-  wxMacFilename2FSSpec(GetFullPath(),&spec) ;
-  OSErr err = FSpGetFInfo( &spec , &fndrInfo ) ;
-  wxCHECK( err == noErr , false ) ;
+    FSRef fsRef ;
+    FSCatalogInfo catInfo;
+    FileInfo *finfo ;

 
 

-  fndrInfo.fdType = type ;
-  fndrInfo.fdCreator = creator ;
-  FSpSetFInfo( &spec , &fndrInfo ) ;
-  return true ;
+    if ( wxMacPathToFSRef( GetFullPath() , &fsRef ) == noErr )
+    {
+        if ( FSGetCatalogInfo (&fsRef, kFSCatInfoFinderInfo, &catInfo, NULL, NULL, NULL) == noErr )
+        {
+            finfo = (FileInfo*)&catInfo.finderInfo;
+            finfo->fileType = type ;
+            finfo->fileCreator = creator ;
+            FSSetCatalogInfo( &fsRef, kFSCatInfoFinderInfo, &catInfo ) ;
+            return true ;
+        }
+    }
+    return false ;

 }
 
 bool wxFileName::MacGetTypeAndCreator( wxUint32 *type , wxUint32 *creator )
 {
 }
 
 bool wxFileName::MacGetTypeAndCreator( wxUint32 *type , wxUint32 *creator )
 {

-  FInfo fndrInfo ;
-  FSSpec spec ;
-  wxMacFilename2FSSpec(GetFullPath(),&spec) ;
-  OSErr err = FSpGetFInfo( &spec , &fndrInfo ) ;
-  wxCHECK( err == noErr , false ) ;
+    FSRef fsRef ;
+    FSCatalogInfo catInfo;
+    FileInfo *finfo ;

 
 

-  *type = fndrInfo.fdType ;
-  *creator = fndrInfo.fdCreator ;
-  return true ;
+    if ( wxMacPathToFSRef( GetFullPath() , &fsRef ) == noErr )
+    {
+        if ( FSGetCatalogInfo (&fsRef, kFSCatInfoFinderInfo, &catInfo, NULL, NULL, NULL) == noErr )
+        {
+            finfo = (FileInfo*)&catInfo.finderInfo;
+            *type = finfo->fileType ;
+            *creator = finfo->fileCreator ;
+            return true ;
+        }
+    }
+    return false ;

 }
 
 bool wxFileName::MacSetDefaultTypeAndCreator()
 }
 
 bool wxFileName::MacSetDefaultTypeAndCreator()