From 1616b0d5f93a326e8b692f5cc09a097c79e8844f Mon Sep 17 00:00:00 2001 From: Olga Rodimina Date: Mon, 8 Dec 2003 22:59:52 +0000 Subject: [PATCH] 2003-12-08 Olga Rodimina * java/awt/Polygon.java (translate): Fixed error that caused polygon to move right/left when up/down translation was required. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c: (getSelectionStart): Initialized start position to 0. (getSelectionEnd): Initialized end position to 0. (getCaretPosition): Initialized caret position to 0. (getText): Initialized selected text to NULL From-SVN: r74445 --- libjava/ChangeLog | 11 +++++++++++ libjava/java/awt/Polygon.java | 2 +- .../gnu_java_awt_peer_gtk_GtkTextComponentPeer.c | 8 ++++---- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 0aa077d294a..0dae20f6731 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,14 @@ +2003-12-08 Olga Rodimina + + * java/awt/Polygon.java + (translate): Fixed error that caused polygon + to move right/left when up/down translation was required. + * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c: + (getSelectionStart): Initialized start position to 0. + (getSelectionEnd): Initialized end position to 0. + (getCaretPosition): Initialized caret position to 0. + (getText): Initialized selected text to NULL + 2003-12-08 Michael Koch Fix for PR libgcj/13176. diff --git a/libjava/java/awt/Polygon.java b/libjava/java/awt/Polygon.java index 1f51ac811d6..113dad992d2 100644 --- a/libjava/java/awt/Polygon.java +++ b/libjava/java/awt/Polygon.java @@ -185,7 +185,7 @@ public class Polygon implements Shape, Serializable while (--i >= 0) { xpoints[i] += dx; - xpoints[i] += dy; + ypoints[i] += dy; } if (bounds != null) { diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c index 7e6d02f178a..b4a00e1288d 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c @@ -101,7 +101,7 @@ Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getCaretPosition (JNIEnv *env, jobject obj) { void *ptr; - int pos; + int pos = 0; GtkEditable *editable; // type of GtkEntry (TextField) GtkWidget *text = NULL; // type of GtkTextView (TextArea) GtkTextBuffer *buf; @@ -187,7 +187,7 @@ Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getSelectionStart (JNIEnv *env, jobject obj) { void *ptr; - int pos; + int pos = 0; GtkEditable *editable; // type of GtkEntry (TextField) GtkWidget *text = NULL; // type of GtkTextView (TextArea) GtkTextBuffer *buf; @@ -244,7 +244,7 @@ Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getSelectionEnd (JNIEnv *env, jobject obj) { void *ptr; - int pos; + int pos = 0; GtkEditable *editable; // type of GtkEntry (TextField) GtkWidget *text = NULL; // type of GtkTextView (TextArea) GtkTextBuffer *buf; @@ -384,7 +384,7 @@ Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getText (JNIEnv *env, jobject obj) { void *ptr; - char *contents; + char *contents = NULL; jstring jcontents; GtkEditable *editable; // type of GtkEntry (TextField) GtkWidget *text = NULL; // type of GtkTextView (TextArea) -- 2.30.2