Workaround for incorrect header in some versions of Mingw32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -87,6 +87,9 @@
|
|||||||
// For GetShort/LongPathName
|
// For GetShort/LongPathName
|
||||||
#ifdef __WIN32__
|
#ifdef __WIN32__
|
||||||
#include "wx/msw/wrapwin.h"
|
#include "wx/msw/wrapwin.h"
|
||||||
|
#if defined(__MINGW32__)
|
||||||
|
#include "wx/msw/gccpriv.h"
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __WXWINCE__
|
#ifdef __WXWINCE__
|
||||||
@@ -1049,7 +1052,12 @@ bool wxFileName::GetShortcutTarget(const wxString& shortcutPath, wxString& targe
|
|||||||
if (SUCCEEDED(hres))
|
if (SUCCEEDED(hres))
|
||||||
{
|
{
|
||||||
wxChar buf[2048];
|
wxChar buf[2048];
|
||||||
|
// Wrong prototype in early versions
|
||||||
|
#if defined(__MINGW32__) && !wxCHECK_W32API_VERSION(2, 2)
|
||||||
|
psl->GetPath((CHAR*) buf, 2048, NULL, SLGP_UNCPRIORITY);
|
||||||
|
#else
|
||||||
psl->GetPath(buf, 2048, NULL, SLGP_UNCPRIORITY);
|
psl->GetPath(buf, 2048, NULL, SLGP_UNCPRIORITY);
|
||||||
|
#endif
|
||||||
targetFilename = wxString(buf);
|
targetFilename = wxString(buf);
|
||||||
success = (shortcutPath != targetFilename);
|
success = (shortcutPath != targetFilename);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user