From: Kim Ho <kho@redhat.com>
Date: Tue, 2 Dec 2003 01:01:07 +0000 (+0000)
Subject: gnu_java_awt_peer_gtk_GtkTextAreaPeer.c (create): Disable wrapping if TextArea has... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=85fa3bdee42c1074898c9646d5d3a5464381452d;p=gcc.git

gnu_java_awt_peer_gtk_GtkTextAreaPeer.c (create): Disable wrapping if TextArea has horizontal scroll bars.

2003-12-01  Kim Ho <kho@redhat.com>

	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c (create):
	Disable wrapping if TextArea has horizontal scroll bars.

From-SVN: r74141
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e05f47d414b..32ff83c8c13 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-01  Kim Ho <kho@redhat.com>
+
+	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c (create):
+	Disable wrapping if TextArea has horizontal scroll bars.
+
 2003-12-01  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
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 a87be723cb3..c6d97d57620 100644
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
@@ -1,5 +1,5 @@
 /* gtktextareapeer.c -- Native implementation of GtkTextAreaPeer
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -64,7 +64,10 @@ Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create
       || scroll == AWT_TEXTAREA_SCROLLBARS_VERTICAL_ONLY) ? 
        GTK_POLICY_ALWAYS : GTK_POLICY_NEVER);
 
-  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW(text), GTK_WRAP_WORD);
+  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text),
+			       (scroll == AWT_TEXTAREA_SCROLLBARS_BOTH
+				|| scroll == AWT_TEXTAREA_SCROLLBARS_HORIZONTAL_ONLY)
+			       ? GTK_WRAP_NONE : GTK_WRAP_WORD);
 
   gdk_threads_leave ();