restore the stream position in wxImageHandler itself instead of forcing all

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

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 5d19924436441740c55ee88437b4d0a68d56a8bc..c097c399e13bf26d879169cfa95372541977b8ea 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -1144,27 +1144,40 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const
     }
 
     // the leading character
     }
 
     // the leading character

-    if ( format == wxPATH_MAC )
+    switch ( format )

     {
     {

-        if ( m_relative )
-            fullpath += wxFILE_SEP_PATH_MAC;
-    }
-    else if ( format == wxPATH_DOS )
-    {
-        if (!m_relative)
-            fullpath += wxFILE_SEP_PATH_DOS;
-    }
-    else if ( format == wxPATH_UNIX )
-    {
-        if ( !m_relative )
-        {
-            // normally the absolute file names starts with a slash with one
-            // exception: file names like "~/foo.bar" don't have it
-            if ( m_dirs.IsEmpty() || m_dirs[0u] != _T('~') )
+        case wxPATH_MAC:
+            if ( m_relative )
+                fullpath += wxFILE_SEP_PATH_MAC;
+            break;
+
+        case wxPATH_DOS:
+            if (!m_relative)
+                fullpath += wxFILE_SEP_PATH_DOS;
+            break;
+
+        default:
+            wxFAIL_MSG( _T("unknown path format") );
+            // fall through
+
+        case wxPATH_UNIX:
+            if ( !m_relative )

             {
             {

-                fullpath += wxFILE_SEP_PATH_UNIX;
+                // normally the absolute file names starts with a slash with
+                // one exception: file names like "~/foo.bar" don't have it
+                if ( m_dirs.IsEmpty() || m_dirs[0u] != _T('~') )
+                {
+                    fullpath += wxFILE_SEP_PATH_UNIX;
+                }

             }
             }

-        }
+            break;
+
+        case wxPATH_VMS:
+            // no leading character here but use this place to unset
+            // wxPATH_GET_SEPARATOR flag: under VMS it doesn't make sense as,
+            // if I understand correctly, there should never be a dot before
+            // the closing bracket
+            flags &= ~wxPATH_GET_SEPARATOR;

     }
 
     // then concatenate all the path components using the path separator
     }
 
     // then concatenate all the path components using the path separator


@@ -1204,13 +1217,14 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const
 
                 case wxPATH_VMS:
                     // TODO: What to do with ".." under VMS
 
                 case wxPATH_VMS:
                     // TODO: What to do with ".." under VMS

+

                     // convert back from ".." to nothing
                     if ( m_dirs[i] != wxT("..") )
                         fullpath += m_dirs[i];
                     break;
             }
 
                     // convert back from ".." to nothing
                     if ( m_dirs[i] != wxT("..") )
                         fullpath += m_dirs[i];
                     break;
             }
 

-            if ( i != dirCount - 1 )
+            if ( (flags & wxPATH_GET_SEPARATOR) || (i != dirCount - 1) )

                 fullpath += GetPathSeparator(format);
         }
 
                 fullpath += GetPathSeparator(format);
         }
 


@@ -1220,11 +1234,6 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const
         }
     }
 
         }
     }
 

-    if ( (flags & wxPATH_GET_SEPARATOR) && !fullpath.empty() && fullpath.Last() != GetPathSeparator(format))
-    {
-        fullpath += GetPathSeparator(format);
-    }
-

     return fullpath;
 }
 
     return fullpath;
 }
 


@@ -1283,6 +1292,9 @@ wxString wxFileName::GetLongPath() const
 
     if ( !s_triedToLoad )
     {
 
     if ( !s_triedToLoad )
     {

+        // suppress the errors about missing GetLongPathName[AW]
+        wxLogNull noLog;
+

         s_triedToLoad = TRUE;
         wxDynamicLibrary dllKernel(_T("kernel32"));
         if ( dllKernel.IsLoaded() )
         s_triedToLoad = TRUE;
         wxDynamicLibrary dllKernel(_T("kernel32"));
         if ( dllKernel.IsLoaded() )


@@ -1320,6 +1332,7 @@ wxString wxFileName::GetLongPath() const
             }
         }
     }
             }
         }
     }

+

     if (success)
         return pathOut;
 #endif // wxUSE_DYNAMIC_LOADER
     if (success)
         return pathOut;
 #endif // wxUSE_DYNAMIC_LOADER


@@ -1689,29 +1702,52 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess,
 #ifdef __WXMAC__
 
 const short kMacExtensionMaxLength = 16 ;
 #ifdef __WXMAC__
 
 const short kMacExtensionMaxLength = 16 ;

-typedef struct
+class MacDefaultExtensionRecord

 {
 {

+public :
+  MacDefaultExtensionRecord()
+  {
+    m_ext[0] = 0 ;
+    m_type = m_creator = NULL ;
+  }
+  MacDefaultExtensionRecord( const MacDefaultExtensionRecord& from )
+  {
+    strcpy( m_ext , from.m_ext ) ;
+    m_type = from.m_type ;
+    m_creator = from.m_creator ;
+  }
+  MacDefaultExtensionRecord( char * extension , OSType type , OSType creator )
+  {
+    strncpy( m_ext , extension , kMacExtensionMaxLength ) ;
+    m_ext[kMacExtensionMaxLength] = 0 ;
+    m_type = type ;
+    m_creator = creator ;
+  }

   char m_ext[kMacExtensionMaxLength] ;
   OSType m_type ;
   OSType m_creator ;
   char m_ext[kMacExtensionMaxLength] ;
   OSType m_type ;
   OSType m_creator ;

-} MacDefaultExtensionRecord ;
+}  ;

 
 #include "wx/dynarray.h"
 WX_DECLARE_OBJARRAY(MacDefaultExtensionRecord, MacDefaultExtensionArray) ;
 
 #include "wx/dynarray.h"
 WX_DECLARE_OBJARRAY(MacDefaultExtensionRecord, MacDefaultExtensionArray) ;

+
+bool gMacDefaultExtensionsInited = false ;
+

 #include "wx/arrimpl.cpp"
 #include "wx/arrimpl.cpp"

-WX_DEFINE_OBJARRAY(MacDefaultExtensionArray) ;
+
+WX_DEFINE_EXPORTED_OBJARRAY(MacDefaultExtensionArray) ;

 
 MacDefaultExtensionArray gMacDefaultExtensions ;
 
 MacDefaultExtensionArray gMacDefaultExtensions ;

-bool gMacDefaultExtensionsInited = false ;

 
 static void MacEnsureDefaultExtensionsLoaded()
 {
   if ( !gMacDefaultExtensionsInited )
   {
 
 static void MacEnsureDefaultExtensionsLoaded()
 {
   if ( !gMacDefaultExtensionsInited )
   {

+    

     // load the default extensions
     // load the default extensions

-    MacDefaultExtensionRecord defaults[] =
+    MacDefaultExtensionRecord defaults[1] =

     {
     {

-      { "txt" , 'TEXT' , 'ttxt' } ,
+      MacDefaultExtensionRecord( "txt" , 'TEXT' , 'ttxt' ) ,

 
     } ;
     // we could load the pc exchange prefs here too
 
     } ;
     // we could load the pc exchange prefs here too