Move menu messages handling from wxFrame to wxTLW in wxMSW.

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

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 31251fcdcb73a3e4dab2ea91acb12ce1486baca6..6ffcbf1288f6b20eab0f65ebd86ff5bba338039d 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -99,7 +99,9 @@
 #endif
 
 #ifdef __WINDOWS__
 #endif
 
 #ifdef __WINDOWS__

-#include "wx/msw/private.h"
+    #include "wx/msw/private.h"
+    #include <shlobj.h>         // for CLSID_ShellLink
+    #include "wx/msw/missing.h"

 #endif
 
 #if defined(__WXMAC__)
 #endif
 
 #if defined(__WXMAC__)


@@ -737,7 +739,12 @@ wxFileSystemObjectExists(const wxString& path, int flags)
     if ( S_ISDIR(st.st_mode) )
         return acceptDir;
     if ( S_ISLNK(st.st_mode) )
     if ( S_ISDIR(st.st_mode) )
         return acceptDir;
     if ( S_ISLNK(st.st_mode) )

-        return (flags & wxFILE_EXISTS_SYMLINK) != 0;
+    {
+        // Take care to not test for "!= 0" here as this would erroneously
+        // return true if only wxFILE_EXISTS_NO_FOLLOW, which is part of
+        // wxFILE_EXISTS_SYMLINK, is set too.
+        return (flags & wxFILE_EXISTS_SYMLINK) == wxFILE_EXISTS_SYMLINK;
+    }

     if ( S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode) )
         return (flags & wxFILE_EXISTS_DEVICE) != 0;
     if ( S_ISFIFO(st.st_mode) )
     if ( S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode) )
         return (flags & wxFILE_EXISTS_DEVICE) != 0;
     if ( S_ISFIFO(st.st_mode) )


@@ -1422,8 +1429,7 @@ bool wxFileName::Rmdir(const wxString& dir, int flags)
             // this directory itself even when it is a symlink -- but without
             // following it. Do it here as wxRmdir() would simply follow if
             // called for a symlink.
             // this directory itself even when it is a symlink -- but without
             // following it. Do it here as wxRmdir() would simply follow if
             // called for a symlink.

-            if ( wxFileName::Exists(dir, wxFILE_EXISTS_SYMLINK |
-                                         wxFILE_EXISTS_NO_FOLLOW) )
+            if ( wxFileName::Exists(dir, wxFILE_EXISTS_SYMLINK) )

             {
                 return wxRemoveFile(dir);
             }
             {
                 return wxRemoveFile(dir);
             }


@@ -1698,13 +1704,6 @@ bool wxFileName::ReplaceHomeDir(wxPathFormat format)
 // quotation marks."
 
 #if defined(__WIN32__) && !defined(__WXWINCE__) && wxUSE_OLE
 // quotation marks."
 
 #if defined(__WIN32__) && !defined(__WXWINCE__) && wxUSE_OLE

-// The following lines are necessary under WinCE
-// #include "wx/msw/private.h"
-// #include <ole2.h>
-#include <shlobj.h>
-#if defined(__WXWINCE__)
-#include <shlguid.h>
-#endif

 
 bool wxFileName::GetShortcutTarget(const wxString& shortcutPath,
                                    wxString& targetFilename,
 
 bool wxFileName::GetShortcutTarget(const wxString& shortcutPath,
                                    wxString& targetFilename,