PatchSet 6724
Date: 2005/07/12 13:35:38
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Added missing hunk of changes to GtkTextAreaPeer
2005-07-12 Dalibor Topic <[EMAIL PROTECTED]>
Resynced with GNU classpath.
Added missing hunk reported by Wolfgang Baer <[EMAIL PROTECTED]>
2005-07-04 Thomas Fitzsimmons <[EMAIL PROTECTED]>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c: Add
method implementations from
gnu_java_awt_peer_gtk_GtkTextComponentPeer.c.
Members:
ChangeLog:1.4248->1.4249
libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c:1.6->1.7
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4248 kaffe/ChangeLog:1.4249
--- kaffe/ChangeLog:1.4248 Tue Jul 12 12:50:26 2005
+++ kaffe/ChangeLog Tue Jul 12 13:35:38 2005
@@ -2,6 +2,18 @@
Resynced with GNU classpath.
+ Added missing hunk reported by Wolfgang Baer <[EMAIL PROTECTED]>
+
+ 2005-07-04 Thomas Fitzsimmons <[EMAIL PROTECTED]>
+
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c: Add
+ method implementations from
+ gnu_java_awt_peer_gtk_GtkTextComponentPeer.c.
+
+2005-07-12 Dalibor Topic <[EMAIL PROTECTED]>
+
+ Resynced with GNU classpath.
+
2005-06-14 Chris Burdess <[EMAIL PROTECTED]>
* gnu/xml/aelfred2/XmlParser.java: ensure that charset parameter of
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.6
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c:1.7
---
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c:1.6
Wed Jul 6 02:26:13 2005
+++
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
Tue Jul 12 13:35:43 2005
@@ -117,22 +117,21 @@
GtkWidget *text;
void *ptr;
const char *str;
- int pos=position;
+
+ 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));
- gtk_text_buffer_get_iter_at_offset (buf, &iter, pos);
+ gtk_text_buffer_get_iter_at_offset (buf, &iter, position);
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
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
