wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

followup for bug 386790, don't use conflicting constant names, breaks camino

Browse Source
This commit is contained in:
joshmoz@gmail.com 2007-09-24 15:41:10 -07:00
parent 32903ea821
commit cdcd6e1fe3
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
widget/src/cocoa/nsChildView.mm
View File

@ -1818,8 +1818,8 @@ NSEvent* gLastDragEvent = nil;
NSURLPboardType,
NSFilesPromisePboardType,
kWildcardPboardType,
kCorePasteboardFlavorType_url,
kCorePasteboardFlavorType_urln,
kCorePboardType_url,
kCorePboardType_urln,
nil]];
return self;

4
widget/src/cocoa/nsClipboard.mm
View File

@ -491,7 +491,7 @@ nsClipboard::PasteboardDictFromTransferable(nsITransferable* aTransferable)
NSString *nativeTitle = [[NSString alloc] initWithCharacters:urlTitle.get() length:urlTitle.Length()];
// be nice to Carbon apps, normalize the receiver's contents using Form C.
[pasteboardOutputDict setObject:[nativeTitle precomposedStringWithCanonicalMapping] forKey:kCorePasteboardFlavorType_urln];
[pasteboardOutputDict setObject:[nativeTitle precomposedStringWithCanonicalMapping] forKey:kCorePboardType_urln];
[nativeTitle release];
}
@ -505,7 +505,7 @@ nsClipboard::PasteboardDictFromTransferable(nsITransferable* aTransferable)
// printf("Escaped url is %s, length %d\n", escData.get(), escData.Length());
NSString *nativeURL = [NSString stringWithUTF8String:escData.get()];
[pasteboardOutputDict setObject:nativeURL forKey:kCorePasteboardFlavorType_url];
[pasteboardOutputDict setObject:nativeURL forKey:kCorePboardType_url];
}
// If it wasn't a type that we recognize as exportable we don't put it on the system
// clipboard. We'll just access it from our cached transferable when we need it.

4
widget/src/cocoa/nsDragService.h
View File

@ -44,8 +44,8 @@
#include <Cocoa/Cocoa.h>
extern NSString* const kWildcardPboardType;
extern NSString* const kCorePasteboardFlavorType_url;
extern NSString* const kCorePasteboardFlavorType_urln;
extern NSString* const kCorePboardType_url;
extern NSString* const kCorePboardType_urln;
class nsDragService : public nsBaseDragService
{

8
widget/src/cocoa/nsDragService.mm
View File

@ -83,8 +83,8 @@ extern NSEvent* gLastDragEvent;
nsISupportsArray *gDraggedTransferables = nsnull;
NSString* const kWildcardPboardType = @"MozillaWildcard";
NSString* const kCorePasteboardFlavorType_url = @"CorePasteboardFlavorType 0x75726C20"; // 'url ' url
NSString* const kCorePasteboardFlavorType_urln = @"CorePasteboardFlavorType 0x75726C6E"; // 'urln' title
NSString* const kCorePboardType_url = @"CorePasteboardFlavorType 0x75726C20"; // 'url ' url
NSString* const kCorePboardType_urln = @"CorePasteboardFlavorType 0x75726C6E"; // 'urln' title
nsDragService::nsDragService()
{
@ -134,8 +134,8 @@ static nsresult SetUpDragClipboard(nsISupportsArray* aTransferableArray)
NSString* currentKey = [types objectAtIndex:i];
id currentValue = [pasteboardOutputDict valueForKey:currentKey];
if (currentKey == NSStringPboardType ||
currentKey == kCorePasteboardFlavorType_url ||
currentKey == kCorePasteboardFlavorType_urln) {
currentKey == kCorePboardType_url ||
currentKey == kCorePboardType_urln) {
[dragPBoard setString:currentValue forType:currentKey];
}
else if (currentKey == NSTIFFPboardType) {