diff options
| author | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-08-05 18:04:09 +0000 |
|---|---|---|
| committer | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-08-05 18:04:09 +0000 |
| commit | fee9ca6a8fed85b4aa5c70ca66520f35b91c56da (patch) | |
| tree | cbcff4299691a1f97a60baf437371dc24fdd7022 /libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c | |
| parent | 746149b7c6ddc67bd15a841ee6e8e50b97945035 (diff) | |
| download | ppe42-gcc-fee9ca6a8fed85b4aa5c70ca66520f35b91c56da.tar.gz ppe42-gcc-fee9ca6a8fed85b4aa5c70ca66520f35b91c56da.zip | |
2003-08-05 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java (postKeyEvent):
Add keyLocation parameter.
* java/awt/event/KeyEvent.java (getKeyText): Fix "NumPad-"
string.
(paramString): Generate keyChar string according to keyChar, not
keyCode.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
(state_to_awt_mods): Handle ALT key.
(keyevent_state_to_awt_mods): New function.
(get_first_keyval_from_keymap): New function.
(keysym_to_awt_keycode): Get virtual key code from keymap.
Handle missing VK_ values.
(keysym_to_awt_keylocation): New function.
(keyevent_to_awt_keychar): New function.
(generates_key_typed_event): Handle non-text-component case.
Handle GDK_KP_Delete and GDK_KP_Enter.
(awt_event_handler): Call new functions to get postKeyEvent
parameters.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (gtkInit):
Update postKeyEvent method signature.
* jni/gtk-peer/gtkpeer.h: Add KEY_LOCATION defines. Add missing
VK_ defines.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70178 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c')
| -rw-r--r-- | libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c | 4 |
1 files changed, 3 insertions, 1 deletions
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 3ebe2ab2849..9a62c1a5a36 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 @@ -47,6 +47,7 @@ Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create GtkWidget *text, *sw; gdk_threads_enter (); + text = gtk_text_view_new (); gtk_widget_show (text); @@ -159,7 +160,7 @@ Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_replaceRange (*env)->ReleaseStringUTFChars (env, contents, str); } -JNIEXPORT void JNICALL +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_gtkSetFont (JNIEnv *env, jobject obj, jstring jname, jint size) { @@ -169,6 +170,7 @@ Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_gtkSetFont PangoFontDescription *font_desc; ptr = NSA_GET_PTR (env, obj); + text = GTK_WIDGET (TEXT_FROM_SW (ptr)); font_name = (*env)->GetStringUTFChars (env, jname, NULL); |
