diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.java | 8 | ||||
| -rw-r--r-- | gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.java | 2 | ||||
| -rw-r--r-- | java/awt/Component.java | 5 |
4 files changed, 16 insertions, 9 deletions
@@ -1,3 +1,13 @@ +2006-08-08 Lillian Angel <langel@redhat.com> + + * gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.java + (GtkDragSourceContextPeer): Added FIXME. Changed call + to setTarget. + * gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.java + (GtkDropTargetContextPeer): Removed target initialization. + * java/awt/Component.java + (setTarget): Removed commented out code. + 2006-08-08 Mark Wielaard <mark@klomp.org> * javax/swing/text/DefaultHighlighter.java: Qualify diff --git a/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.java b/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.java index 168c8ba2a..6ab4c5a0a 100644 --- a/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.java +++ b/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.java @@ -67,7 +67,7 @@ public class GtkDragSourceContextPeer native void connectSignals(ComponentPeer comp); native void create(ComponentPeer comp); native void nativeSetCursor(int cursor); - native void setTarget(ComponentPeer target); + native void setTarget(GtkDropTargetContextPeer target); public GtkDragSourceContextPeer(DragGestureEvent e) { @@ -79,8 +79,10 @@ public class GtkDragSourceContextPeer connectSignals(peer); cursor = comp.getCursor(); - if (target != null) - setTarget(target.getPeer()); + // FIXME: Where do we set the target? + + if ((target != null)) + setTarget(new GtkDropTargetContextPeer(target)); } ComponentPeer getComponentPeer(Component c) diff --git a/gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.java b/gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.java index 90d6fbe78..f24b3f39b 100644 --- a/gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.java +++ b/gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.java @@ -40,7 +40,6 @@ package gnu.java.awt.dnd.peer.gtk; import gnu.java.awt.peer.gtk.GtkGenericPeer; -import java.awt.Component; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; import java.awt.dnd.DropTarget; @@ -55,7 +54,6 @@ public class GtkDropTargetContextPeer public GtkDropTargetContextPeer(Object obj) { super(obj); - GtkDragSourceContextPeer.target = (Component) obj; } public void setTargetActions(int actions) diff --git a/java/awt/Component.java b/java/awt/Component.java index 6566efa98..bb5ce3f33 100644 --- a/java/awt/Component.java +++ b/java/awt/Component.java @@ -700,10 +700,7 @@ public abstract class Component public void setDropTarget(DropTarget dt) { this.dropTarget = dt; - // XXX this is bogus, Component cannot have a dependency on GTK - // if (dropTarget != null) - // dropTarget.getDropTargetContext().addNotify( - // new GtkDropTargetContextPeer(this)); + dropTarget.addNotify(peer); } /** |