X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5974c3cf0664c2db575ee956a731a0ae7c96d074..2d35020a8dd1a0908f4e76af323cc0d413d6b8c3:/src/common/filename.cpp

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 9efe9d12e0..02e83a3506 100644
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -946,7 +946,7 @@ bool wxFileName::Normalize(int flags,
         m_dirs.Add(dir);
     }
     
-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__WXWINCE__) && wxUSE_OLE
     if ( (flags & wxPATH_NORM_SHORTCUT) )
     {
         wxString filename;
@@ -1001,7 +1001,7 @@ bool wxFileName::Normalize(int flags,
 // 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>
@@ -1009,15 +1009,9 @@ bool wxFileName::Normalize(int flags,
 #if defined(__WXWINCE__)
 #include <shlguid.h>
 #endif
-#endif
 
-#ifdef __WIN32__
 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);
     
@@ -1063,7 +1057,6 @@ bool wxFileName::GetShortcutTarget(const wxString& shortcutPath, wxString& targe
 	}
 	psl->Release();
 	return success;
-#endif
 }
 #endif