Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-01-26 12:53:39 +00:00
parent ff95fdbb31
commit 6bda7391c1
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/filename.cpp
View File

@@ -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) ) if ( (flags & wxPATH_NORM_SHORTCUT) )
{ {
wxString filename; wxString filename;
@@ -1001,7 +1001,7 @@ bool wxFileName::Normalize(int flags,
// files\myapp.exe) that includes spaces needs to be enclosed in // files\myapp.exe) that includes spaces needs to be enclosed in
// quotation marks." // quotation marks."
#if defined(__WIN32__) && !defined(__WXWINCE__) #if defined(__WIN32__) && !defined(__WXWINCE__) && wxUSE_OLE
// The following lines are necessary under WinCE // The following lines are necessary under WinCE
// #include "wx/msw/private.h" // #include "wx/msw/private.h"
// #include <ole2.h> // #include <ole2.h>
@@ -1009,15 +1009,9 @@ bool wxFileName::Normalize(int flags,
#if defined(__WXWINCE__) #if defined(__WXWINCE__)
#include <shlguid.h> #include <shlguid.h>
#endif #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; wxString path, file, ext;
wxSplitPath(shortcutPath, & path, & file, & ext); wxSplitPath(shortcutPath, & path, & file, & ext);
@@ -1063,7 +1057,6 @@ bool wxFileName::GetShortcutTarget(const wxString& shortcutPath, wxString& targe
} }
psl->Release(); psl->Release();
return success; return success;
#endif
} }
#endif #endif