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

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 e05f47d414bbfb698afd8564590cb99b5e083f16..32ff83c8c136ce84cfe013826e99f0e90beb97d7 100644 (file)
--- 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 a87be723cb365c2450f3fafc6079c3e271251116..c6d97d57620190a2b4edcb7d1f4c47f23997b412 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
@@ -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 ();