Tex2RTF: underscores now only checked for if syntax checking is on.

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

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 610a7c2993a5abd10055329c2ffb7e42a8f5d251..aad2543db419971a8a13755a6a396fc417ee3af7 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -152,6 +152,13 @@ bool wxFileName::DirExists( const wxString &dir )
     return ::wxDirExists( dir );
 }
 
     return ::wxDirExists( dir );
 }
 

+wxDateTime wxFileName::GetModificationTime()
+{
+    wxDateTime ret( wxFileModificationTime( GetFullPath() ) );
+
+    return ret;
+}
+

 // ----------------------------------------------------------------------------
 // CWD and HOME stuff
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // CWD and HOME stuff
 // ----------------------------------------------------------------------------


@@ -215,6 +222,7 @@ bool wxFileName::Mkdir( const wxString &dir, int perm, bool full )
     {
         wxFileName filename(dir);
         wxArrayString dirs = filename.GetDirs();
     {
         wxFileName filename(dir);
         wxArrayString dirs = filename.GetDirs();

+        dirs.Add(filename.GetName());

 
         size_t count = dirs.GetCount();
         size_t i;
 
         size_t count = dirs.GetCount();
         size_t i;


@@ -456,6 +464,7 @@ bool wxFileName::IsWild( wxPathFormat format )
 {
     // FIXME: this is probably false for Mac and this is surely wrong for most
     //        of Unix shells (think about "[...]")
 {
     // FIXME: this is probably false for Mac and this is surely wrong for most
     //        of Unix shells (think about "[...]")

+       (void)format;

     return m_name.find_first_of(_T("*?")) != wxString::npos;
 }
 
     return m_name.find_first_of(_T("*?")) != wxString::npos;
 }
 


@@ -521,6 +530,7 @@ wxString wxFileName::GetPath( bool add_separator, wxPathFormat format ) const
 
 wxString wxFileName::GetFullPath( wxPathFormat format ) const
 {
 
 wxString wxFileName::GetFullPath( wxPathFormat format ) const
 {

+       (void)format;

     return GetPathWithSep() + GetFullName();
 }
 
     return GetPathWithSep() + GetFullName();
 }
 


@@ -563,16 +573,16 @@ wxString wxFileName::GetLongPath() const
     typedef DWORD (*GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD);
 
     static bool s_triedToLoad = FALSE;
     typedef DWORD (*GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD);
 
     static bool s_triedToLoad = FALSE;

-    static GET_LONG_PATH_NAME s_pfnGetLongPathName = NULL;

 
     if ( !s_triedToLoad )
     {
         s_triedToLoad = TRUE;
 
     if ( !s_triedToLoad )
     {
         s_triedToLoad = TRUE;

-
+#if 0

         wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
         wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));

-        if ( 0 ) // dllKernel )
+        if ( dllKernel )

         {
             // may succeed or fail depending on the Windows version
         {
             // may succeed or fail depending on the Windows version

+                       static GET_LONG_PATH_NAME s_pfnGetLongPathName = NULL;

 #ifdef _UNICODE
             s_pfnGetLongPathName = (GET_LONG_PATH_NAME) wxDllLoader::GetSymbol(dllKernel, _T("GetLongPathNameW"));
 #else
 #ifdef _UNICODE
             s_pfnGetLongPathName = (GET_LONG_PATH_NAME) wxDllLoader::GetSymbol(dllKernel, _T("GetLongPathNameW"));
 #else


@@ -605,6 +615,7 @@ wxString wxFileName::GetLongPath() const
                 }
             }
         }
                 }
             }
         }

+#endif         

     }
     if (success)
         return pathOut;
     }
     if (success)
         return pathOut;


@@ -620,7 +631,10 @@ wxString wxFileName::GetLongPath() const
         HANDLE hFind;
         pathOut = wxEmptyString;
 
         HANDLE hFind;
         pathOut = wxEmptyString;
 

-        size_t count = m_dirs.GetCount();
+        wxArrayString dirs = GetDirs();
+        dirs.Add(GetName());
+
+        size_t count = dirs.GetCount();

         size_t i;
         wxString tmpPath;
 
         size_t i;
         wxString tmpPath;
 


@@ -628,7 +642,7 @@ wxString wxFileName::GetLongPath() const
         {
             // We're using pathOut to collect the long-name path,
             // but using a temporary for appending the last path component which may be short-name
         {
             // We're using pathOut to collect the long-name path,
             // but using a temporary for appending the last path component which may be short-name

-            tmpPath = pathOut + m_dirs[i];
+            tmpPath = pathOut + dirs[i];

 
             if (tmpPath.Last() == wxT(':'))
             {
 
             if (tmpPath.Last() == wxT(':'))
             {