--- a/jdk/src/macosx/native/sun/awt/CDragSource.h Thu Dec 26 21:33:24 2013 +0400
+++ b/jdk/src/macosx/native/sun/awt/CDragSource.h Thu Jan 09 12:47:01 2014 +0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,9 +29,15 @@
#import <Cocoa/Cocoa.h>
#include <jni.h>
+@class CDragSource;
+
+@protocol CDragSourceHolder
+- (void) setDragSource:(CDragSource *)source;
+@end
+
@interface CDragSource : NSObject {
@private
- NSView* fView;
+ NSView<CDragSourceHolder>* fView;
jobject fComponent;
jobject fDragSourceContextPeer;
@@ -53,8 +59,6 @@
jint fDragMouseModifiers;
}
-+ (CDragSource *) currentDragSource;
-
// Common methods:
- (id) init:(jobject)jDragSourceContextPeer
component:(jobject)jComponent
@@ -84,13 +88,6 @@
- (void)draggedImage:(NSImage *)image movedTo:(NSPoint)screenPoint;
- (BOOL)ignoreModifierKeysWhileDragging;
-// Updates from the destination to the source
-- (void) postDragEnter;
-- (void) postDragExit;
-
-// Utility
-- (NSPoint) mapNSScreenPointToJavaWithOffset:(NSPoint) point;
-
@end
#endif // CDragSource_h