@@ -321,7 +321,7 @@ bool File::moveToTrash() const throw() | |||||
if (! trashCan.isDirectory()) | if (! trashCan.isDirectory()) | ||||
return false; | return false; | ||||
return moveFileTo (trashCan.getNonexistentChildFile (getFileNameWithoutExtension(), | |||||
return moveFileTo (trashCan.getNonexistentChildFile (getFileNameWithoutExtension(), | |||||
getFileExtension())); | getFileExtension())); | ||||
} | } | ||||
@@ -356,7 +356,7 @@ bool File::moveToTrash() const throw() | |||||
NSString* p = juceStringToNS (getFullPathName()); | NSString* p = juceStringToNS (getFullPathName()); | ||||
return [[NSWorkspace sharedWorkspace] | |||||
return [[NSWorkspace sharedWorkspace] | |||||
performFileOperation: NSWorkspaceRecycleOperation | performFileOperation: NSWorkspaceRecycleOperation | ||||
source: [p stringByDeletingLastPathComponent] | source: [p stringByDeletingLastPathComponent] | ||||
destination: @"" | destination: @"" | ||||
@@ -126,7 +126,7 @@ bool File::moveToTrash() const throw() | |||||
fos.hwnd = (HWND) 0; | fos.hwnd = (HWND) 0; | ||||
fos.pFrom = p; | fos.pFrom = p; | ||||
fos.pTo = NULL; | fos.pTo = NULL; | ||||
fos.fFlags = FOF_ALLOWUNDO | FOF_NOERRORUI | FOF_SILENT | FOF_NOCONFIRMATION | |||||
fos.fFlags = FOF_ALLOWUNDO | FOF_NOERRORUI | FOF_SILENT | FOF_NOCONFIRMATION | |||||
| FOF_NOCONFIRMMKDIR | FOF_RENAMEONCOLLISION; | | FOF_NOCONFIRMMKDIR | FOF_RENAMEONCOLLISION; | ||||
return SHFileOperation (&fos) == 0; | return SHFileOperation (&fos) == 0; | ||||
@@ -536,13 +536,13 @@ const File File::getLinkedTarget() const throw() | |||||
return result; | return result; | ||||
IShellLink* shellLink = 0; | IShellLink* shellLink = 0; | ||||
if (SUCCEEDED (CoCreateInstance (CLSID_ShellLink, 0, CLSCTX_INPROC_SERVER, | |||||
if (SUCCEEDED (CoCreateInstance (CLSID_ShellLink, 0, CLSCTX_INPROC_SERVER, | |||||
IID_IShellLink, (LPVOID*) &shellLink))) | IID_IShellLink, (LPVOID*) &shellLink))) | ||||
{ | { | ||||
IPersistFile* persistFile; | IPersistFile* persistFile; | ||||
if (SUCCEEDED (shellLink->QueryInterface (IID_IPersistFile, (LPVOID*) &persistFile))) | if (SUCCEEDED (shellLink->QueryInterface (IID_IPersistFile, (LPVOID*) &persistFile))) | ||||
{ | { | ||||
if (SUCCEEDED (persistFile->Load ((const WCHAR*) p, STGM_READ)) | |||||
if (SUCCEEDED (persistFile->Load ((const WCHAR*) p, STGM_READ)) | |||||
&& SUCCEEDED (shellLink->Resolve (0, SLR_ANY_MATCH | SLR_NO_UI))) | && SUCCEEDED (shellLink->Resolve (0, SLR_ANY_MATCH | SLR_NO_UI))) | ||||
{ | { | ||||
WIN32_FIND_DATA winFindData; | WIN32_FIND_DATA winFindData; | ||||
@@ -7974,4 +7974,3 @@ static const unsigned char temp17[] = {47,42,13,10,32,32,61,61,61,61,61,61,61,61 | |||||
111,109,109,97,110,100,77,97,110,97,103,101,114,41,13,10,123,13,10,32,32,32,32,114,101,116,117,114,110,32,110,101,119,32,87,105,100,103,101,116, | 111,109,109,97,110,100,77,97,110,97,103,101,114,41,13,10,123,13,10,32,32,32,32,114,101,116,117,114,110,32,110,101,119,32,87,105,100,103,101,116, | ||||
115,68,101,109,111,32,40,99,111,109,109,97,110,100,77,97,110,97,103,101,114,41,59,13,10,125,13,10,0,0}; | 115,68,101,109,111,32,40,99,111,109,109,97,110,100,77,97,110,97,103,101,114,41,59,13,10,125,13,10,0,0}; | ||||
const char* BinaryData::widgetsdemo_cpp = (const char*) temp17; | const char* BinaryData::widgetsdemo_cpp = (const char*) temp17; | ||||
@@ -911,4 +911,3 @@ static const unsigned char temp4[] = {137,80,78,71,13,10,26,10,0,0,0,13,73,72,68 | |||||
0,98,28,9,155,95,0,2,104,68,236,11,1,8,160,17,225,73,128,0,3,0,120,52,172,151,198,78,252,63,0,0,0,0,73,69,78,68,174,66, | 0,98,28,9,155,95,0,2,104,68,236,11,1,8,160,17,225,73,128,0,3,0,120,52,172,151,198,78,252,63,0,0,0,0,73,69,78,68,174,66, | ||||
96,130,0,0}; | 96,130,0,0}; | ||||
const char* BinaryData::prefs_misc_png = (const char*) temp4; | const char* BinaryData::prefs_misc_png = (const char*) temp4; | ||||
@@ -101,7 +101,7 @@ public: | |||||
int subPathIndex; | int subPathIndex; | ||||
/** Returns true if the current segment is the last in the current sub-path. */ | /** Returns true if the current segment is the last in the current sub-path. */ | ||||
bool isLastInSubpath() const throw() { return stackPos == stackBase | |||||
bool isLastInSubpath() const throw() { return stackPos == stackBase | |||||
&& (index >= path.numElements | && (index >= path.numElements | ||||
|| points [index] == Path::moveMarker); } | || points [index] == Path::moveMarker); } | ||||