On Sat, 2006-08-05 at 11:28 +0200, Jeroen Frijters wrote:
> Hi,
>
> I commented out the GTK specific code in java/awt/Component.java.
> Component cannot have dependencies on any specific type of peer.
>
> Lillian could you please find a generic way to do what is required?
>
Right now, its not possible to do it another way. I have removed this
code and added a comment else where. Thanks for pointing this out.
2006-08-08 Lillian Angel <[EMAIL PROTECTED]>
* 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.
> Regards,
> Jeroen
>
> 2006-08-05 Jeroen Frijters <[EMAIL PROTECTED]>
>
> * java/awt/Component.java (setDropTarget): Commented out GTK
> specific
> code.
Index: gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.java,v
retrieving revision 1.5
diff -u -r1.5 GtkDragSourceContextPeer.java
--- gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.java 28 Jul 2006 16:52:14 -0000 1.5
+++ gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.java 8 Aug 2006 15:37:25 -0000
@@ -67,7 +67,7 @@
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 @@
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)
Index: gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.java,v
retrieving revision 1.3
diff -u -r1.3 GtkDropTargetContextPeer.java
--- gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.java 28 Jul 2006 15:52:06 -0000 1.3
+++ gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.java 8 Aug 2006 15:37:25 -0000
@@ -40,7 +40,6 @@
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 GtkDropTargetContextPeer(Object obj)
{
super(obj);
- GtkDragSourceContextPeer.target = (Component) obj;
}
public void setTargetActions(int actions)
Index: java/awt/Component.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Component.java,v
retrieving revision 1.143
diff -u -r1.143 Component.java
--- java/awt/Component.java 5 Aug 2006 09:28:06 -0000 1.143
+++ java/awt/Component.java 8 Aug 2006 15:37:26 -0000
@@ -700,10 +700,7 @@
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);
}
/**
