2004-03-20 Mark Wielaard <mark@klomp.org>

	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getVScrollbarWidth):
	Don't access ws when it is null.
	(Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getHScrollbarHeight):
	Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@79708 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2d99dca..27fbd60 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-20  Mark Wielaard  <mark@klomp.org>
+
+       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
+       (Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getVScrollbarWidth):
+       Don't access ws when it is null.
+       (Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getHScrollbarHeight):
+       Likewise.
+
 2004-03-19  Jeroen Frijters  <jeroen@frijters.net>
 
        * java/lang/ThreadGroup.java (list): Changed print to println.

diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
index ed9ced6..704273c 100644 (file)
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
@@ -188,9 +188,12 @@ Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getHScrollbarHeight
   gdk_threads_enter ();
   sw = GTK_SCROLLED_WINDOW (ptr);
 
-  gtk_widget_size_request (sw->hscrollbar, &requisition);
-  gtk_widget_style_get (GTK_WIDGET (sw), "scrollbar_spacing", &spacing, NULL);
-  height = requisition.height + spacing;
+  if (sw)
+    {
+      gtk_widget_size_request (sw->hscrollbar, &requisition);
+      gtk_widget_style_get (GTK_WIDGET (sw), "scrollbar_spacing", &spacing, NULL);
+      height = requisition.height + spacing;
+    }
 
   gdk_threads_leave ();
 
@@ -212,9 +215,12 @@ Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getVScrollbarWidth
   gdk_threads_enter ();
   sw = GTK_SCROLLED_WINDOW (ptr);
 
-  gtk_widget_size_request (sw->vscrollbar, &requisition);
-  gtk_widget_style_get (GTK_WIDGET (sw), "scrollbar_spacing", &spacing, NULL);
-  width = requisition.width + spacing;
+  if (sw)
+    {
+      gtk_widget_size_request (sw->vscrollbar, &requisition);
+      gtk_widget_style_get (GTK_WIDGET (sw), "scrollbar_spacing", &spacing, NULL);
+      width = requisition.width + spacing;
+    }
 
   gdk_threads_leave ();