don't include GetShortcutTarget if OLE is not available; removed fake noop implementa...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 9efe9d12e0ec4b5e10c643141c55fb25a879dccd..02e83a3506b124d5a71fdae287a745967f8a614f 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -946,7 +946,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;


@@ -1001,7 +1001,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 +1009,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 +1057,6 @@ bool wxFileName::GetShortcutTarget(const wxString& shortcutPath, wxString& targe
        }
        psl->Release();
        return success;
        }
        psl->Release();
        return success;

-#endif

 }
 #endif
 
 }
 #endif