fixed #if in Create(); don't use wxModelessWindows any more

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

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 9efe9d12e0ec4b5e10c643141c55fb25a879dccd..5bebeedae0ff0eb549e2c5686a70204d8bd0164b 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -585,7 +585,7 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp)
     }
 
 #elif defined(__WINDOWS__) && !defined(__WXMICROWIN__)
     }
 
 #elif defined(__WINDOWS__) && !defined(__WXMICROWIN__)

-#ifdef __WIN32__
+

     if ( dir.empty() )
     {
         if ( !::GetTempPath(MAX_PATH, wxStringBuffer(dir, MAX_PATH + 1)) )
     if ( dir.empty() )
     {
         if ( !::GetTempPath(MAX_PATH, wxStringBuffer(dir, MAX_PATH + 1)) )


@@ -612,12 +612,6 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp)
 
         path.clear();
     }
 
         path.clear();
     }

-#else // Win16
-    if ( !::GetTempFileName(NULL, prefix, 0, wxStringBuffer(path, 1025)) )
-    {
-        path.clear();
-    }
-#endif // Win32/16

 
 #else // !Windows
     if ( dir.empty() )
 
 #else // !Windows
     if ( dir.empty() )


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

-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__WXWINCE__) && wxUSE_OLE

     if ( (flags & wxPATH_NORM_SHORTCUT) )
     {
         wxString filename;
     if ( (flags & wxPATH_NORM_SHORTCUT) )
     {
         wxString filename;


@@ -967,6 +961,7 @@ bool wxFileName::Normalize(int flags,
     {
         // VZ: expand env vars here too?
 
     {
         // VZ: expand env vars here too?
 

+        m_volume.MakeLower();

         m_name.MakeLower();
         m_ext.MakeLower();
     }
         m_name.MakeLower();
         m_ext.MakeLower();
     }


@@ -1001,7 +996,7 @@ bool wxFileName::Normalize(int flags,
 // files\myapp.exe) that includes spaces needs to be enclosed in
 // quotation marks."
 
 // files\myapp.exe) that includes spaces needs to be enclosed in
 // quotation marks."
 

-#if defined(__WIN32__) && !defined(__WXWINCE__)
+#if defined(__WIN32__) && !defined(__WXWINCE__) && wxUSE_OLE

 // The following lines are necessary under WinCE
 // #include "wx/msw/private.h"
 // #include <ole2.h>
 // The following lines are necessary under WinCE
 // #include "wx/msw/private.h"
 // #include <ole2.h>


@@ -1009,15 +1004,9 @@ bool wxFileName::Normalize(int flags,
 #if defined(__WXWINCE__)
 #include <shlguid.h>
 #endif
 #if defined(__WXWINCE__)
 #include <shlguid.h>
 #endif

-#endif

 
 

-#ifdef __WIN32__

 bool wxFileName::GetShortcutTarget(const wxString& shortcutPath, wxString& targetFilename, wxString* arguments)
 {
 bool wxFileName::GetShortcutTarget(const wxString& shortcutPath, wxString& targetFilename, wxString* arguments)
 {

-#ifdef __WXWINCE__
-    // Doesn't compile on WinCE yet
-    return FALSE;
-#else

     wxString path, file, ext;
     wxSplitPath(shortcutPath, & path, & file, & ext);
     
     wxString path, file, ext;
     wxSplitPath(shortcutPath, & path, & file, & ext);
     


@@ -1063,7 +1052,6 @@ bool wxFileName::GetShortcutTarget(const wxString& shortcutPath, wxString& targe
        }
        psl->Release();
        return success;
        }
        psl->Release();
        return success;

-#endif

 }
 #endif
 
 }
 #endif
 


@@ -1154,8 +1142,8 @@ bool wxFileName::SameAs(const wxFileName& filepath, wxPathFormat format) const
 
     // get cwd only once - small time saving
     wxString cwd = wxGetCwd();
 
     // get cwd only once - small time saving
     wxString cwd = wxGetCwd();

-    fn1.Normalize(wxPATH_NORM_ALL & ~wxPATH_NORM_CASE, cwd, format);
-    fn2.Normalize(wxPATH_NORM_ALL & ~wxPATH_NORM_CASE, cwd, format);
+    fn1.Normalize(wxPATH_NORM_ALL | wxPATH_NORM_CASE, cwd, format);
+    fn2.Normalize(wxPATH_NORM_ALL | wxPATH_NORM_CASE, cwd, format);

 
     if ( fn1.GetFullPath() == fn2.GetFullPath() )
         return true;
 
     if ( fn1.GetFullPath() == fn2.GetFullPath() )
         return true;