GtkContainerPeer.java (handleEvent): Check for null Graphics pointer returned by...

2003-12-16  Fernando Nasser  <fnasser@redhat.com>

        * gnu/java/awt/peer/gtk/GtkContainerPeer.java (handleEvent): Check for
        null Graphics pointer returned by FileDialogPeer.

From-SVN: r74744

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 35ee612260ede54c6040296fbee424cea173f9d5..32e44100a56420f0aeedb19ab4c7db95f355d8a3 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-16  Fernando Nasser  <fnasser@redhat.com>
+
+       * gnu/java/awt/peer/gtk/GtkContainerPeer.java (handleEvent): Check for
+       null Graphics pointer returned by FileDialogPeer.
+
 2003-12-17  Michael Koch  <konqueror@gmx.de>
 
        * libltdl/stamp-h.in: Removed, not used anymore.

diff --git a/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.java
index 5225ccc5f1433a918ecbb6c6d7b33add6431d73f..8ab373419174206764ca2d6945367392244beb0f 100644 (file)
--- a/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.java
+++ b/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.java
@@ -107,6 +107,11 @@ public class GtkContainerPeer extends GtkComponentPeer
          try 
            {
              Graphics g = getGraphics ();
+
+             // Some peers like GtkFileDialogPeer are repainted by Gtk itself
+             if (g == null)
+               break;
+
              g.setClip (((PaintEvent)event).getUpdateRect());
 
              if (id == PaintEvent.PAINT)