2006-04-03 Sven de Marothy <[EMAIL PROTECTED]>
* gnu/java/awt/peer/gtk/GtkClipboard.java: Add support for
non-GtkImage images.
--
Sven de Marothy <[EMAIL PROTECTED]>
Index: gnu/java/awt/peer/gtk/GtkClipboard.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/awt/peer/gtk/GtkClipboard.java,v
retrieving revision 1.11
diff -U3 -r1.11 GtkClipboard.java
--- gnu/java/awt/peer/gtk/GtkClipboard.java 9 Mar 2006 21:29:58 -0000 1.11
+++ gnu/java/awt/peer/gtk/GtkClipboard.java 3 Apr 2006 18:28:47 -0000
@@ -172,15 +172,12 @@
|| flavor.isRepresentationClassReader())
text = true;
- // XXX - We only support automatic image conversion for
- // GtkImages at the moment. So explicitly check that we have
- // one.
if (! images && flavors[i].equals(DataFlavor.imageFlavor))
{
try
{
Object o = contents.getTransferData(DataFlavor.imageFlavor);
- if (o instanceof GtkImage)
+ if (o instanceof Image)
images = true;
}
catch (UnsupportedFlavorException ufe)
@@ -291,7 +288,11 @@
try
{
- return (GtkImage) contents.getTransferData(DataFlavor.imageFlavor);
+ Object o = contents.getTransferData(DataFlavor.imageFlavor);
+ if( o instanceof GtkImage )
+ return (GtkImage) o;
+ else
+ return new GtkImage(((Image)o).getSource());
}
catch (UnsupportedFlavorException ufe)
{
