[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: gtk peer notify fixes

[Kaffe CVS]

PatchSet 5697 
Date: 2005/04/18 18:05:46
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: gtk peer notify fixes

2005-04-18  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-03-30  Sven de Marothy  <sven at physto.se>

        * gnu/java/awt/peer/gtk/GdkGraphics.java:
        (drawImage): Don't notify the image observer for offscreen images.
        * gnu/java/awt/peer/gtk/GtkImagePainter.java:
        (setPixels): Don't notify the image observer.

Members: 
	ChangeLog:1.3863->1.3864 
	libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics.java:1.10->1.11 
	libraries/javalib/gnu/java/awt/peer/gtk/GtkImagePainter.java:1.4->1.5 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3863 kaffe/ChangeLog:1.3864
--- kaffe/ChangeLog:1.3863	Mon Apr 18 18:04:00 2005
+++ kaffe/ChangeLog	Mon Apr 18 18:05:46 2005
@@ -2,6 +2,17 @@
 
         Resynced with GNU Classpath.
 
+	2005-03-30  Sven de Marothy  <sven at physto.se>
+
+        * gnu/java/awt/peer/gtk/GdkGraphics.java:
+        (drawImage): Don't notify the image observer for offscreen images.
+        * gnu/java/awt/peer/gtk/GtkImagePainter.java:
+        (setPixels): Don't notify the image observer.
+
+2005-04-18  Dalibor Topic  <robilad at kaffe.org>
+
+        Resynced with GNU Classpath.
+
 	2005-03-30  Michael Koch  <konqueror at gmx.de>
 
         * java/beans/beancontext/BeanContextServicesSupport.java
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics.java:1.10 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics.java:1.11
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics.java:1.10	Sat Feb 19 15:30:25 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics.java	Mon Apr 18 18:05:53 2005
@@ -147,11 +147,6 @@
         int height = img.getHeight (null);
 	copyPixmap (img.getGraphics (), 
 		    x, y, width, height);
-        // FIXME: need to differentiate between SOMEBITS and FRAMEBITS.
-        if (observer != null)
-          observer.imageUpdate (img,
-                                ImageObserver.FRAMEBITS,
-                                x, y, width, height);
 	return true;
       }
 
@@ -171,12 +166,6 @@
         int height = img.getHeight (null);
 	copyPixmap (img.getGraphics (), 
 		    x, y, width, height);
-
-        // FIXME: need to differentiate between SOMEBITS and FRAMEBITS.
-        if (observer != null)
-          observer.imageUpdate (img,
-                                ImageObserver.FRAMEBITS,
-                                x, y, width, height);
 	return true;
       }
 
@@ -197,11 +186,6 @@
         copyAndScalePixmap (img.getGraphics (), false, false,
                             0, 0, img.getWidth (null), img.getHeight (null), 
                             x, y, width, height);
-        // FIXME: need to differentiate between SOMEBITS and FRAMEBITS.
-        if (observer != null)
-          observer.imageUpdate (img,
-                                ImageObserver.FRAMEBITS,
-                                x, y, width, height);
         return true;
       }
 
@@ -286,12 +270,6 @@
         copyAndScalePixmap (img.getGraphics (), x_flip, y_flip,
                             sx_start, sy_start, s_width, s_height, 
                             dx_start, dy_start, d_width, d_height);
-
-        // FIXME: need to differentiate between SOMEBITS and FRAMEBITS.
-        if (observer != null)
-          observer.imageUpdate (img,
-                                ImageObserver.FRAMEBITS,
-                                dx_start, dy_start, d_width, d_height);
         return true;
       }
 
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkImagePainter.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkImagePainter.java:1.4 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkImagePainter.java:1.5
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkImagePainter.java:1.4	Fri Dec  3 23:21:56 2004
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkImagePainter.java	Mon Apr 18 18:05:57 2005
@@ -184,11 +184,6 @@
 	        startX + x, startY + y,
 		width, height, convertPixels (pixels, model), offset,
 		scansize, affine);
-
-    if (observer != null)
-      observer.imageUpdate (image,
-			    ImageObserver.SOMEBITS,
-			    x, y, width, height);
   }
 
   public void