Attempt to fix MSVC6 compilation after the previous commit.
Include <shlobj.h> before our wx/msw/missing.h, otherwise many things were redefined. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
6fdda829b4
commit
a246ab8b5e
@ -100,6 +100,7 @@
|
||||
|
||||
#ifdef __WINDOWS__
|
||||
#include "wx/msw/private.h"
|
||||
#include <shlobj.h> // for CLSID_ShellLink
|
||||
#include "wx/msw/missing.h"
|
||||
#endif
|
||||
|
||||
@ -1703,13 +1704,6 @@ bool wxFileName::ReplaceHomeDir(wxPathFormat format)
|
||||
// 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,
|
||||
|
Loading…
Reference in New Issue
Block a user