TextArea wrapping fix

[Kim Ho]

Hi,

This patch disables wrapping on a TextArea if it has horizontal scroll
bars.

Cheers,

Kim

2003-11-28  Kim Ho <kho@redhat.com>
                                                                                
        * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c (create):
        Disable wrapping if TextArea has horizontal scroll bars.

-------------- next part --------------
? deps.mk
? gnu/classpath/Configuration.java
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
===================================================================
RCS file: /cvsroot/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c,v
retrieving revision 1.8
diff -c -p -r1.8 gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
*** jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c	30 Oct 2003 17:37:33 -0000	1.8
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c	27 Nov 2003 17:52:01 -0000
*************** Java_gnu_java_awt_peer_gtk_GtkTextAreaPe
*** 64,70 ****
        || 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);
  
    gdk_threads_leave ();
  
--- 64,71 ----
        || scroll == AWT_TEXTAREA_SCROLLBARS_VERTICAL_ONLY) ? 
         GTK_POLICY_ALWAYS : GTK_POLICY_NEVER);
  
!   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 ();
  
*************** Java_gnu_java_awt_peer_gtk_GtkTextAreaPe
*** 172,178 ****
    text = GTK_WIDGET (TEXT_FROM_SW (ptr));
  
    font_name = (*env)->GetStringUTFChars (env, name, NULL);
! 
    gdk_threads_enter();
  
    font_desc = pango_font_description_from_string (font_name);
--- 173,179 ----
    text = GTK_WIDGET (TEXT_FROM_SW (ptr));
  
    font_name = (*env)->GetStringUTFChars (env, name, NULL);
!   
    gdk_threads_enter();
  
    font_desc = pango_font_description_from_string (font_name);