From 6bda7391c10e2341d5ef407df1330b9e39c202f8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 26 Jan 2004 12:53:39 +0000 Subject: [PATCH] don't include GetShortcutTarget if OLE is not available; removed fake noop implementation from WinCE, it's better to let the user know it doesn't work by not providing it in the first place git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/filename.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) 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 @@ -1009,15 +1009,9 @@ bool wxFileName::Normalize(int flags, #if defined(__WXWINCE__) #include #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 -- 2.45.2