aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFernando Nasser <fnasser@redhat.com>2003-12-17 17:20:00 +0000
committerFernando Nasser <fnasser@gcc.gnu.org>2003-12-17 17:20:00 +0000
commit310b075bd8e557cdf8ae07a44770d4bcba5772c0 (patch)
tree2c5ef55462b03b14862d3ae1baff714ac02d3264
parent5c832178f89fcb4115dab67587c694f654c23d1d (diff)
downloadgcc-310b075bd8e557cdf8ae07a44770d4bcba5772c0.zip
gcc-310b075bd8e557cdf8ae07a44770d4bcba5772c0.tar.gz
gcc-310b075bd8e557cdf8ae07a44770d4bcba5772c0.tar.bz2
GtkContainerPeer.java (handleEvent): Check for null Graphics pointer returned by FileDialogPeer.
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
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.java5
2 files changed, 10 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 35ee612..32e4410 100644
--- 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 5225ccc..8ab3734 100644
--- 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)