[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: awt and swing fixes

Kaffe CVS cvs-commits at kaffe.org
Tue Jul 5 19:40:46 PDT 2005


PatchSet 6703 
Date: 2005/07/06 02:26:05
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: awt and swing fixes

Members: 
	ChangeLog:1.4227->1.4228 
	include/Makefile.am:1.106->1.107 
	include/Makefile.in:1.235->1.236 
	libltdl/configure:1.83->1.84 
	libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:1.15->1.16 
	libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.36->1.37 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:1.13->1.14 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c:1.8->1.9(DEAD) 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c:1.5->1.6 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c:1.7->1.8(DEAD) 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c:1.5->1.6 
	libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c:1.11->1.12 
	libraries/clib/awt/classpath-gtk/gtk-peer/gtkpeer.h:1.12->1.13 
	libraries/javalib/Makefile.am:1.369->1.370 
	libraries/javalib/Makefile.in:1.459->1.460 
	libraries/javalib/all.files:1.140->1.141 
	libraries/javalib/gnu/java/awt/ClasspathToolkit.java:1.10->1.11 
	libraries/javalib/gnu/java/awt/EmbeddedWindow.java:1.4->1.5 
	libraries/javalib/gnu/java/awt/EmbeddedWindowSupport.java:1.3->1.4(DEAD) 
	libraries/javalib/gnu/java/awt/peer/gtk/GtkComponentPeer.java:1.16->1.17 
	libraries/javalib/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java:1.4->1.5 
	libraries/javalib/gnu/java/awt/peer/gtk/GtkTextComponentPeer.java:1.4->1.5(DEAD) 
	libraries/javalib/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java:1.5->1.6 
	libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java:1.18->1.19 
	libraries/javalib/javax/swing/JComponent.java:1.25->1.26 
	libraries/javalib/javax/swing/JTabbedPane.java:1.8->1.9 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4227 kaffe/ChangeLog:1.4228
--- kaffe/ChangeLog:1.4227	Wed Jul  6 02:07:05 2005
+++ kaffe/ChangeLog	Wed Jul  6 02:26:05 2005
@@ -2,6 +2,74 @@
 
 	Resynced with GNU Classpath.
 
+	2005-07-05  Mark Wielaard  <mark at klomp.org>
+
+        * include/Makefile.am (GTKPEER_H_FILES): Removed GtkTextComponentPeer.
+        * include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h: Removed.
+        * gnu/java/awt/peer/gtk/GtkComponentPeer.java
+        (classpath_gtk_component_connect_nonfocus_signals): Mark argument
+        unused.
+        (classpath_gtk_component_connect_signals): Likewise.
+
+	2005-07-04  Thomas Fitzsimmons  <fitzsim at redhat.com>
+
+        * gnu/java/awt/peer/gtk/GtkComponentPeer.java (postTextEvent): New
+        method.
+        * gnu/java/awt/peer/gtk/GtkTextAreaPeer.java: Add
+        TextComponentPeer method declarations.
+        * gnu/java/awt/peer/gtk/GtkTextFieldPeer.java: Likewise.
+        * gnu/java/awt/peer/gtk/GtkTextComponentPeer.java: Remove file.
+        * include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h: Regenerate.
+        * include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h: Likewise.
+        * native/jni/gtk-peer/Makefile.am (libgtkpeer_la_SOURCES): Remove
+        gnu_java_awt_peer_gtk_GtkTextComponentPeer.c.
+        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
+        (classpath_gtk_component_connect_nonfocus_signals): New function.
+        (classpath_gtk_component_connect_signals): Likewise.
+        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c: Add
+        method implementations from
+        gnu_java_awt_peer_gtk_GtkTextComponentPeer.c.
+        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c:
+        Likewise.
+        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c:
+        Remove file.
+        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
+        (gtkInit): Get postTextEventID from GtkComponentPeer, not
+        GtkTextComponentPeer.
+        * native/jni/gtk-peer/gtkpeer.h (classpath_gtk_textcomponent_init_jni): Declare.
+        (classpath_gtk_component_connect_signals): Likewise.
+        (classpath_gtk_component_connect_nonfocus_signals): Likewise.
+        (classpath_gtk_textcomponent_connect_signals): Likewise.
+
+        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c:
+        Rename gnu_java_awt_peer_gtk_GtkScrollbarPeer.c.
+        * native/jni/gtk-peer/Makefile.am (libgtkpeer_la_SOURCES): Rename
+        gnu_java_awt_peer_gtk_GtkScrollBarPeer.c
+        gnu_java_awt_peer_gtk_GtkScrollbarPeer.c.
+
+        * gnu/java/awt/ClasspathToolkit.java (createEmbeddedWindow): New method.
+        * gnu/java/awt/EmbeddedWindow.java (addNotify): Assume we're using
+        ClasspathToolkit.
+        * gnu/java/awt/EmbeddedWindowSupport.java: Remove file.
+        * gnu/java/awt/peer/gtk/GtkToolkit.java: Remove references to
+        EmbeddedWindowSupport.
+
+	2005-07-04  Sven de Marothy  <sven at physto.se>
+
+        * javax/swing/JComponent.java:
+        (setEnabled): Fix typo in event string.
+
+	2005-07-04  Anthony Balkissoon  <abalkiss at redhat.com>
+
+        * javax/swing/JTabbedPane.java
+        (Page.setDisplayedMnemonicIndex): Added check for index being -1
+        before calling title.charAt(index).  Eliminates StringIndexOutOfBounds
+        error.
+
+2005-07-06  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2005-07-04  Mark Wielaard  <mark at klomp.org>
 
         * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java (initialized):
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.106 kaffe/include/Makefile.am:1.107
--- kaffe/include/Makefile.am:1.106	Sat Jun 11 20:23:01 2005
+++ kaffe/include/Makefile.am	Wed Jul  6 02:26:08 2005
@@ -178,7 +178,6 @@
 	gnu_java_awt_peer_gtk_GtkScrollbarPeer.h \
 	gnu_java_awt_peer_gtk_GtkScrollPanePeer.h \
 	gnu_java_awt_peer_gtk_GtkTextAreaPeer.h \
-	gnu_java_awt_peer_gtk_GtkTextComponentPeer.h \
 	gnu_java_awt_peer_gtk_GtkTextFieldPeer.h \
 	gnu_java_awt_peer_gtk_GtkToolkit.h \
 	gnu_java_awt_peer_gtk_GtkWindowPeer.h \
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.235 kaffe/include/Makefile.in:1.236
--- kaffe/include/Makefile.in:1.235	Sat Jun 11 20:23:01 2005
+++ kaffe/include/Makefile.in	Wed Jul  6 02:26:08 2005
@@ -537,7 +537,6 @@
 	gnu_java_awt_peer_gtk_GtkScrollbarPeer.h \
 	gnu_java_awt_peer_gtk_GtkScrollPanePeer.h \
 	gnu_java_awt_peer_gtk_GtkTextAreaPeer.h \
-	gnu_java_awt_peer_gtk_GtkTextComponentPeer.h \
 	gnu_java_awt_peer_gtk_GtkTextFieldPeer.h \
 	gnu_java_awt_peer_gtk_GtkToolkit.h \
 	gnu_java_awt_peer_gtk_GtkWindowPeer.h \
Index: kaffe/libltdl/configure
diff -u kaffe/libltdl/configure:1.83 kaffe/libltdl/configure:1.84
--- kaffe/libltdl/configure:1.83	Mon Jul  4 15:29:58 2005
+++ kaffe/libltdl/configure	Wed Jul  6 02:26:09 2005
@@ -7330,11 +7330,12 @@
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
 	pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec=
+	  whole_archive_flag_spec='${wl}--whole-archive,`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
 	  ;;
 	pgf77* | pgf90* )			# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec=
-	  tmp_addflag=' -fpic -Mnomain' ;;
+	  whole_archive_flag_spec='${wl}--whole-archive,`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
 	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
@@ -8498,7 +8499,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -8563,8 +8564,8 @@
   need_lib_prefix=no
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
   case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
   esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -9354,7 +9355,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9357 "configure"
+#line 9358 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9452,7 +9453,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9455 "configure"
+#line 9456 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10950,12 +10951,12 @@
 	;;
       pgCC*)
         # Portland Group C++ compiler
-	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-  	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+  	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 
 	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	whole_archive_flag_spec_CXX=''
+	whole_archive_flag_spec_CXX='${wl}--whole-archive,`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
         ;;
       cxx*)
 	# Compaq C++
@@ -11704,11 +11705,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11707: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11708: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11711: \$? = $ac_status" >&5
+   echo "$as_me:11712: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11766,11 +11767,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11769: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11770: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11773: \$? = $ac_status" >&5
+   echo "$as_me:11774: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12279,7 +12280,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -12344,8 +12345,8 @@
   need_lib_prefix=no
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
   case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
   esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -13135,7 +13136,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 13138 "configure"
+#line 13139 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13233,7 +13234,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 13236 "configure"
+#line 13237 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14118,11 +14119,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14121: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14122: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14125: \$? = $ac_status" >&5
+   echo "$as_me:14126: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14180,11 +14181,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14183: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14184: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14187: \$? = $ac_status" >&5
+   echo "$as_me:14188: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14395,11 +14396,12 @@
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
 	pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec_F77=
+	  whole_archive_flag_spec_F77='${wl}--whole-archive,`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
 	  ;;
 	pgf77* | pgf90* )			# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec_F77=
-	  tmp_addflag=' -fpic -Mnomain' ;;
+	  whole_archive_flag_spec_F77='${wl}--whole-archive,`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
 	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
@@ -15543,7 +15545,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -15608,8 +15610,8 @@
   need_lib_prefix=no
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
   case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
   esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -16305,11 +16307,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16308: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16310: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16312: \$? = $ac_status" >&5
+   echo "$as_me:16314: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16567,11 +16569,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16570: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16572: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16574: \$? = $ac_status" >&5
+   echo "$as_me:16576: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16629,11 +16631,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16632: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16634: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16636: \$? = $ac_status" >&5
+   echo "$as_me:16638: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16844,11 +16846,12 @@
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
 	pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec_GCJ=
+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive,`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
 	  ;;
 	pgf77* | pgf90* )			# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec_GCJ=
-	  tmp_addflag=' -fpic -Mnomain' ;;
+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive,`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
 	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
@@ -18012,7 +18015,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -18077,8 +18080,8 @@
   need_lib_prefix=no
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
   case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
   esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -18868,7 +18871,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18871 "configure"
+#line 18874 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18966,7 +18969,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18969 "configure"
+#line 18972 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -21232,7 +21235,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 21235 "configure"
+#line 21238 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:1.15 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:1.16
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:1.15	Sat Jun 11 20:23:02 2005
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am	Wed Jul  6 02:26:12 2005
@@ -39,7 +39,7 @@
 	gnu_java_awt_peer_gtk_GtkMenuPeer.c \
 	gnu_java_awt_peer_gtk_GtkPanelPeer.c \
 	gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c \
-	gnu_java_awt_peer_gtk_GtkScrollBarPeer.c \
+	gnu_java_awt_peer_gtk_GtkScrollbarPeer.c \
 	gnu_java_awt_peer_gtk_GtkScrollPanePeer.c \
 	gnu_java_awt_peer_gtk_GtkTextAreaPeer.c \
 	gnu_java_awt_peer_gtk_GtkTextComponentPeer.c \
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.36 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.37
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.36	Sat Jun 11 20:23:02 2005
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in	Wed Jul  6 02:26:12 2005
@@ -110,7 +110,7 @@
 	gnu_java_awt_peer_gtk_GtkMenuPeer.c \
 	gnu_java_awt_peer_gtk_GtkPanelPeer.c \
 	gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c \
-	gnu_java_awt_peer_gtk_GtkScrollBarPeer.c \
+	gnu_java_awt_peer_gtk_GtkScrollbarPeer.c \
 	gnu_java_awt_peer_gtk_GtkScrollPanePeer.c \
 	gnu_java_awt_peer_gtk_GtkTextAreaPeer.c \
 	gnu_java_awt_peer_gtk_GtkTextComponentPeer.c \
@@ -149,7 +149,7 @@
 	libgtkpeer_la-gnu_java_awt_peer_gtk_GtkMenuPeer.lo \
 	libgtkpeer_la-gnu_java_awt_peer_gtk_GtkPanelPeer.lo \
 	libgtkpeer_la-gnu_java_awt_peer_gtk_GtkPopupMenuPeer.lo \
-	libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollBarPeer.lo \
+	libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollbarPeer.lo \
 	libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollPanePeer.lo \
 	libgtkpeer_la-gnu_java_awt_peer_gtk_GtkTextAreaPeer.lo \
 	libgtkpeer_la-gnu_java_awt_peer_gtk_GtkTextComponentPeer.lo \
@@ -492,7 +492,7 @@
 	gnu_java_awt_peer_gtk_GtkMenuPeer.c \
 	gnu_java_awt_peer_gtk_GtkPanelPeer.c \
 	gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c \
-	gnu_java_awt_peer_gtk_GtkScrollBarPeer.c \
+	gnu_java_awt_peer_gtk_GtkScrollbarPeer.c \
 	gnu_java_awt_peer_gtk_GtkScrollPanePeer.c \
 	gnu_java_awt_peer_gtk_GtkTextAreaPeer.c \
 	gnu_java_awt_peer_gtk_GtkTextComponentPeer.c \
@@ -649,8 +649,8 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgtkpeer_la-gnu_java_awt_peer_gtk_GtkMenuPeer.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgtkpeer_la-gnu_java_awt_peer_gtk_GtkPanelPeer.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgtkpeer_la-gnu_java_awt_peer_gtk_GtkPopupMenuPeer.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollBarPeer.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollPanePeer.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollbarPeer.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgtkpeer_la-gnu_java_awt_peer_gtk_GtkTextAreaPeer.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgtkpeer_la-gnu_java_awt_peer_gtk_GtkTextComponentPeer.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libgtkpeer_la-gnu_java_awt_peer_gtk_GtkTextFieldPeer.Plo at am__quote@
@@ -891,12 +891,12 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgtkpeer_la_CPPFLAGS) $(CPPFLAGS) $(libgtkpeer_la_CFLAGS) $(CFLAGS) -c -o libgtkpeer_la-gnu_java_awt_peer_gtk_GtkPopupMenuPeer.lo `test -f 'gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c' || echo '$(srcdir)/'`gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
 
-libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollBarPeer.lo: gnu_java_awt_peer_gtk_GtkScrollBarPeer.c
- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgtkpeer_la_CPPFLAGS) $(CPPFLAGS) $(libgtkpeer_la_CFLAGS) $(CFLAGS) -MT libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollBarPeer.lo -MD -MP -MF "$(DEPDIR)/libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollBarPeer.Tpo" -c -o libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollBarPeer.lo `test -f 'gnu_java_awt_peer_gtk_GtkScrollBarPeer.c' || echo '$(srcdir)/'`gnu_java_awt_peer_gtk_GtkScrollBarPeer.c; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollBarPeer.Tpo" "$(DEPDIR)/libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollBarPeer.Plo"; else rm -f "$(DEPDIR)/libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollBarPeer.Tpo"; exit 1; fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gnu_java_awt_peer_gtk_GtkScrollBarPeer.c' object='libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollBarPeer.lo' libtool=yes @AMDEPBACKSLASH@
+libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollbarPeer.lo: gnu_java_awt_peer_gtk_GtkScrollbarPeer.c
+ at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgtkpeer_la_CPPFLAGS) $(CPPFLAGS) $(libgtkpeer_la_CFLAGS) $(CFLAGS) -MT libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollbarPeer.lo -MD -MP -MF "$(DEPDIR)/libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollbarPeer.Tpo" -c -o libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollbarPeer.lo `test -f 'gnu_java_awt_peer_gtk_GtkScrollbarPeer.c' || echo '$(srcdir)/'`gnu_java_awt_peer_gtk_GtkScrollbarPeer.c; \
+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollbarPeer.Tpo" "$(DEPDIR)/libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollbarPeer.Plo"; else rm -f "$(DEPDIR)/libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollbarPeer.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gnu_java_awt_peer_gtk_GtkScrollbarPeer.c' object='libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollbarPeer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgtkpeer_la_CPPFLAGS) $(CPPFLAGS) $(libgtkpeer_la_CFLAGS) $(CFLAGS) -c -o libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollBarPeer.lo `test -f 'gnu_java_awt_peer_gtk_GtkScrollBarPeer.c' || echo '$(srcdir)/'`gnu_java_awt_peer_gtk_GtkScrollBarPeer.c
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgtkpeer_la_CPPFLAGS) $(CPPFLAGS) $(libgtkpeer_la_CFLAGS) $(CFLAGS) -c -o libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollbarPeer.lo `test -f 'gnu_java_awt_peer_gtk_GtkScrollbarPeer.c' || echo '$(srcdir)/'`gnu_java_awt_peer_gtk_GtkScrollbarPeer.c
 
 libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollPanePeer.lo: gnu_java_awt_peer_gtk_GtkScrollPanePeer.c
 @am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgtkpeer_la_CPPFLAGS) $(CPPFLAGS) $(libgtkpeer_la_CFLAGS) $(CFLAGS) -MT libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollPanePeer.lo -MD -MP -MF "$(DEPDIR)/libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollPanePeer.Tpo" -c -o libgtkpeer_la-gnu_java_awt_peer_gtk_GtkScrollPanePeer.lo `test -f 'gnu_java_awt_peer_gtk_GtkScrollPanePeer.c' || echo '$(srcdir)/'`gnu_java_awt_peer_gtk_GtkScrollPanePeer.c; \
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:1.13 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:1.14
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:1.13	Mon Jul  4 00:04:01 2005
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c	Wed Jul  6 02:26:12 2005
@@ -1076,3 +1076,43 @@
   gdk_threads_enter ();
   return FALSE;
 }
+
+void
+classpath_gtk_component_connect_nonfocus_signals (GObject *ptr, jobject *gref)
+ {
+   /* FIXME */
+#if 0
+  g_signal_connect (G_OBJECT (ptr), "button-press-event",
+                    G_CALLBACK (component_button_press_cb), *gref);
+ 
+  g_signal_connect (G_OBJECT (ptr), "button-release-event",
+                    G_CALLBACK (component_button_release_cb), *gref);
+ 
+  g_signal_connect (G_OBJECT (ptr), "enter-notify-event",
+                    G_CALLBACK (component_enter_notify_cb), *gref);
+ 
+  g_signal_connect (G_OBJECT (ptr), "expose-event",
+                    G_CALLBACK (component_expose_cb), *gref);
+ 
+  g_signal_connect (G_OBJECT (ptr), "leave-notify-event",
+                    G_CALLBACK (component_leave_notify_cb), *gref);
+
+  g_signal_connect (G_OBJECT (ptr), "motion-notify-event",
+                    G_CALLBACK (component_motion_notify_cb), *gref);
+#endif
+}
+
+void
+classpath_gtk_component_connect_signals (GObject *ptr, jobject *gref)
+{
+   /* FIXME */
+#if 0
+  classpath_gtk_component_connect_nonfocus_signals (ptr, gref);
+ 
+   g_signal_connect (G_OBJECT (ptr), "focus-in-event",
+                    G_CALLBACK (component_focus_in_cb), *gref);
+ 
+   g_signal_connect (G_OBJECT (ptr), "focus-out-event",
+                    G_CALLBACK (component_focus_out_cb), *gref);
+#endif
+}
===================================================================
Checking out kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c
RCS:  /home/cvs/kaffe/kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Attic/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c,v
VERS: 1.8
***************
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c	Wed Jul  6 02:40:45 2005
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,247 +0,0 @@
-/* gtkscrollbarpeer.c -- Native implementation of GtkScrollbarPeer
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-#include <math.h>
-#include "gtkpeer.h"
-#include "gnu_java_awt_peer_gtk_GtkComponentPeer.h"
-#include "gnu_java_awt_peer_gtk_GtkScrollbarPeer.h"
-
-#if GTK_MINOR_VERSION > 4
-static gboolean slider_moved_cb (GtkRange *range,
-                                 GtkScrollType scroll,
-                                 gdouble value,
-                                 jobject obj);
-#else
-static void post_change_event (GtkRange *range,
-			       jobject peer);
-#endif
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_create
-  (JNIEnv *env, jobject obj, jint orientation, jint value,
-   jint min, jint max, jint step_incr, jint page_incr, jint visible_amount)
-{
-  GtkWidget *scrollbar;
-  GtkObject *adj;
-
-  /* Create global reference and save it for future use */
-  NSA_SET_GLOBAL_REF (env, obj);
-
-  gdk_threads_enter ();
-
-  adj = gtk_adjustment_new ((gdouble) value,
-                            (gdouble) min,
-                            (gdouble) max,
-			    (gdouble) step_incr,
-                            (gdouble) page_incr,
-			    (gdouble) visible_amount);
-
-  scrollbar = orientation
-    ? gtk_vscrollbar_new (GTK_ADJUSTMENT (adj))
-    : gtk_hscrollbar_new (GTK_ADJUSTMENT (adj));
-
-  GTK_RANGE (scrollbar)->round_digits = 0;
-  /* These calls seem redundant but they are not.  They clamp values
-     so that the slider's entirety is always between the two
-     steppers. */
-  gtk_range_set_range (GTK_RANGE (scrollbar), (gdouble) min, (gdouble) max);
-  gtk_range_set_value (GTK_RANGE (scrollbar), (gdouble) value);
-
-  gdk_threads_leave ();
-
-  NSA_SET_PTR (env, obj, scrollbar);
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectSignals
-  (JNIEnv *env, jobject obj)
-{
-  void *ptr = NSA_GET_PTR (env, obj);
-  jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
-  g_assert (gref);
-
-  gdk_threads_enter ();
-
-#if GTK_MINOR_VERSION > 4
-  g_signal_connect (G_OBJECT (ptr), "change-value",
-                    GTK_SIGNAL_FUNC (slider_moved_cb), *gref);
-#else
-  g_signal_connect (G_OBJECT (ptr), "value-changed",
-                    G_CALLBACK (post_change_event), *gref);
-#endif
-
-  gdk_threads_leave ();
-
-  /* Connect the superclass signals.  */
-  Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (env, obj);
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setLineIncrement
-  (JNIEnv *env, jobject obj, jint amount)
-{
-  void *ptr;
-  GtkAdjustment *adj;
-
-  ptr = NSA_GET_PTR (env, obj);
-
-  gdk_threads_enter ();
-
-  adj = gtk_range_get_adjustment (GTK_RANGE (ptr));
-  adj->step_increment = (gdouble) amount;
-  gtk_adjustment_changed (adj);
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setPageIncrement
-  (JNIEnv *env, jobject obj, jint amount)
-{
-  void *ptr;
-  GtkAdjustment *adj;
-
-  ptr = NSA_GET_PTR (env, obj);
-
-  gdk_threads_enter ();
-
-  adj = gtk_range_get_adjustment (GTK_RANGE (ptr));
-  adj->page_increment = (gdouble) amount;
-  gtk_adjustment_changed (adj);
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setValues
-  (JNIEnv *env, jobject obj, jint value, jint visible, jint min, jint max)
-{
-  void *ptr;
-  GtkAdjustment *adj;
-
-  ptr = NSA_GET_PTR (env, obj);
-
-  gdk_threads_enter ();
-
-  adj = gtk_range_get_adjustment (GTK_RANGE (ptr));
-  adj->page_size = (gdouble) visible;
-
-  gtk_range_set_range (GTK_RANGE (ptr), (gdouble) min, (gdouble) max);
-  gtk_range_set_value (GTK_RANGE (ptr), (gdouble) value);
-
-  gdk_threads_leave ();
-}
-
-#if GTK_MINOR_VERSION > 4
-static gboolean
-slider_moved_cb (GtkRange *range,
-                 GtkScrollType scroll,
-                 gdouble value,
-                 jobject obj)
-{
-  GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (range));
-
-  value = CLAMP (value, adj->lower,
-                 (adj->upper - adj->page_size));
-
-  if (range->round_digits >= 0)
-    {
-      gdouble power;
-      gint i;
-
-      i = range->round_digits;
-      power = 1;
-      while (i--)
-        power *= 10;
-      
-      value = floor ((value * power) + 0.5) / power;
-    }
-  
-  switch (scroll)
-    {
-    case GTK_SCROLL_STEP_BACKWARD:
-      (*gdk_env())->CallVoidMethod (gdk_env(), obj, postAdjustmentEventID,
-                                    AWT_ADJUSTMENT_UNIT_DECREMENT,
-                                    (jint) value);
-      break;
-    case GTK_SCROLL_STEP_FORWARD:
-      (*gdk_env())->CallVoidMethod (gdk_env(), obj, postAdjustmentEventID,
-                                    AWT_ADJUSTMENT_UNIT_INCREMENT,
-                                    (jint) value);
-      break;
-    case GTK_SCROLL_PAGE_BACKWARD:
-      (*gdk_env())->CallVoidMethod (gdk_env(), obj, postAdjustmentEventID,
-                                    AWT_ADJUSTMENT_BLOCK_DECREMENT,
-                                    (jint) value);
-      break;
-    case GTK_SCROLL_PAGE_FORWARD:
-      (*gdk_env())->CallVoidMethod (gdk_env(), obj, postAdjustmentEventID,
-                                    AWT_ADJUSTMENT_BLOCK_INCREMENT,
-                                    (jint) value);
-      break;
-    case GTK_SCROLL_NONE:
-    case GTK_SCROLL_JUMP:
-    case GTK_SCROLL_STEP_UP:
-    case GTK_SCROLL_STEP_DOWN:
-    case GTK_SCROLL_PAGE_UP:
-    case GTK_SCROLL_PAGE_DOWN:
-    case GTK_SCROLL_STEP_LEFT:
-    case GTK_SCROLL_STEP_RIGHT:
-    case GTK_SCROLL_PAGE_LEFT:
-    case GTK_SCROLL_PAGE_RIGHT:
-    case GTK_SCROLL_START:
-    case GTK_SCROLL_END:
-    default:
-      /* GTK_SCROLL_JUMP: */
-      (*gdk_env())->CallVoidMethod (gdk_env(), obj, postAdjustmentEventID,
-                                    AWT_ADJUSTMENT_TRACK,
-                                    (jint) value);
-      break;
-    }
-  return FALSE;
-}
-#else
-static void
-post_change_event (GtkRange *range, jobject peer)
-{
-  GtkAdjustment *adj;
-  adj = gtk_range_get_adjustment (range);
-  (*gdk_env())->CallVoidMethod (gdk_env(), peer, postAdjustmentEventID,
-				AWT_ADJUSTMENT_TRACK, (jint) adj->value);
-}
-#endif
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c:1.5 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c:1.6
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c:1.5	Mon Jul  4 00:04:04 2005
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c	Wed Jul  6 02:26:13 2005
@@ -39,7 +39,6 @@
 #include "gtkpeer.h"
 #include "gnu_java_awt_peer_gtk_GtkTextAreaPeer.h"
 
-#define TEXT_FROM_SW(obj) (GTK_TEXT_VIEW(GTK_SCROLLED_WINDOW (obj)->container.child))
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create
   (JNIEnv *env, jobject obj,
@@ -47,11 +46,11 @@
 {
   GtkWidget *text, *sw;
 
+  gdk_threads_enter ();
+
   /* Create global reference and save it for future use */
   NSA_SET_GLOBAL_REF (env, obj);
 
-  gdk_threads_enter ();
-
   text = gtk_text_view_new ();
   gtk_widget_set_size_request (text, textview_width, textview_height);
   gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW (text), TRUE);
@@ -76,9 +75,37 @@
 				|| scroll == AWT_TEXTAREA_SCROLLBARS_HORIZONTAL_ONLY)
 			       ? GTK_WRAP_NONE : GTK_WRAP_WORD);
 
+  NSA_SET_PTR (env, obj, sw);
+
   gdk_threads_leave ();
+}
 
-  NSA_SET_PTR (env, obj, sw);
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_connectSignals
+  (JNIEnv *env, jobject obj)
+{
+  GtkWidget *text = NULL;
+  GtkTextBuffer *buf;
+  void *ptr;
+  jobject *gref;
+
+  gdk_threads_enter ();
+
+  ptr = NSA_GET_PTR (env, obj);
+  gref = NSA_GET_GLOBAL_REF (env, obj);
+
+  /* Unwrap the text view from the scrolled window */
+  text = gtk_bin_get_child (GTK_BIN (ptr));
+
+  buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text));
+
+  /* TextComponent signals */
+  classpath_gtk_textcomponent_connect_signals (G_OBJECT (buf), gref);
+
+  /* Component signals */
+  classpath_gtk_component_connect_signals (G_OBJECT (text), gref);
+
+  gdk_threads_leave ();
 }
 
 JNIEXPORT void JNICALL 
@@ -120,12 +147,12 @@
   int mystart = start;
   int myend = end;
 
+  gdk_threads_enter ();
+  
   ptr = NSA_GET_PTR (env, obj);
   str = (*env)->GetStringUTFChars (env, contents, NULL);
   
-  gdk_threads_enter ();
-  
-  text = GTK_WIDGET (TEXT_FROM_SW (ptr));
+  text = gtk_bin_get_child (GTK_BIN (ptr));
 
   buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text));
 
@@ -136,8 +163,9 @@
   gtk_text_buffer_get_iter_at_offset (buf, &iter, mystart);
   gtk_text_buffer_insert(buf, &iter, str, (size_t) strlen (str));
 
-  gdk_threads_leave ();
   (*env)->ReleaseStringUTFChars (env, contents, str);
+
+  gdk_threads_leave ();
 }
 
 JNIEXPORT void JNICALL
@@ -149,16 +177,17 @@
   GtkWidget *text;
   PangoFontDescription *font_desc;
 
+  gdk_threads_enter();
+
   ptr = NSA_GET_PTR (env, obj);
 
-  text = GTK_WIDGET (TEXT_FROM_SW (ptr));
+  text = gtk_bin_get_child (GTK_BIN (ptr));
 
   font_name = (*env)->GetStringUTFChars (env, name, NULL);
 
-  gdk_threads_enter();
-
   font_desc = pango_font_description_from_string (font_name);
-  pango_font_description_set_size (font_desc, size * dpi_conversion_factor);
+  pango_font_description_set_size (font_desc,
+                                   size * dpi_conversion_factor);
 
   if (style & AWT_STYLE_BOLD)
     pango_font_description_set_weight (font_desc, PANGO_WEIGHT_BOLD);
@@ -170,9 +199,9 @@
 
   pango_font_description_free (font_desc);
 
-  gdk_threads_leave();
-
   (*env)->ReleaseStringUTFChars (env, name, font_name);
+
+  gdk_threads_leave();
 }
 
 JNIEXPORT void JNICALL 
@@ -182,11 +211,11 @@
   void *ptr;
   GtkWidget *text;
 
-  ptr = NSA_GET_PTR (env, obj);
-  
   gdk_threads_enter ();
 
-  text = GTK_WIDGET (TEXT_FROM_SW (ptr));
+  ptr = NSA_GET_PTR (env, obj);
+  
+  text = gtk_bin_get_child (GTK_BIN (ptr));
 
   gtk_widget_grab_focus (text);
 
@@ -203,9 +232,10 @@
   jint height = 0;
   jint spacing = 0;
 
+  gdk_threads_enter ();
+
   ptr = NSA_GET_PTR (env, obj);
 
-  gdk_threads_enter ();
   sw = GTK_SCROLLED_WINDOW (ptr);
 
   if (sw)
@@ -230,9 +260,10 @@
   jint width = 0;
   jint spacing = 0;
 
+  gdk_threads_enter ();
+
   ptr = NSA_GET_PTR (env, obj);
 
-  gdk_threads_enter ();
   sw = GTK_SCROLLED_WINDOW (ptr);
 
   if (sw)
@@ -245,4 +276,244 @@
   gdk_threads_leave ();
 
   return width;
+}
+
+JNIEXPORT jint JNICALL 
+Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getCaretPosition
+  (JNIEnv *env, jobject obj)
+{
+  void *ptr;
+  int pos = 0;

*** Patch too long, truncated ***




More information about the kaffe mailing list