Re: [cp-patches] [patch] refactor text peers to remove GtkTextComponentPeer

[Mark Wielaard]

Hi,

On Mon, 2005-07-04 at 19:57 -0400, Thomas Fitzsimmons wrote:
> GtkTextComponentPeer is unnecessary since the GTK widgets, GtkTextView
> and GtkEntry are not related.  This patch refactors the
> GtkTextComponentPeer code into GtkTextAreaPeer and GtkTextFieldPeer.  I
> applied this to mainline.

Please be a bit more careful. This broke the build since you forgot to
change the include file generation. And --enable-Werror since
classpath_gtk_component_connect_signals and the nonfocus variant are not
actually implemented. Fixed as follows:

2005-07-05  Mark Wielaard  <address@hidden>

       * 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.

When we switch to gcj 4.0+ we can make --enable-regen-headers the
default with gcjh to catch this kind of thing more easily.

Committed,

Mark

Index: include/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v
retrieving revision 1.44
diff -u -r1.44 Makefile.am
--- include/Makefile.am 2 Jun 2005 13:18:10 -0000       1.44
+++ include/Makefile.am 5 Jul 2005 05:41:40 -0000
@@ -58,7 +58,6 @@
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h \
-$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkToolkit.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkWindowPeer.h \
Index: include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h
===================================================================
RCS file: include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h
diff -N include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h
--- include/gnu_java_awt_peer_gtk_GtkTextComponentPeer.h        28 May 2004 
17:27:53 -0000      1.4
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __gnu_java_awt_peer_gtk_GtkTextComponentPeer__
-#define __gnu_java_awt_peer_gtk_GtkTextComponentPeer__
-
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_connectSignals (JNIEnv *env, 
jobject);
-JNIEXPORT jint JNICALL 
Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getCaretPosition (JNIEnv *env, 
jobject);
-JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_setCaretPosition (JNIEnv *env, 
jobject, jint);
-JNIEXPORT jint JNICALL 
Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getSelectionStart (JNIEnv *env, 
jobject);
-JNIEXPORT jint JNICALL 
Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getSelectionEnd (JNIEnv *env, 
jobject);
-JNIEXPORT jstring JNICALL 
Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_getText (JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_select 
(JNIEnv *env, jobject, jint, jint);
-JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_setEditable (JNIEnv *env, 
jobject, jboolean);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_setText 
(JNIEnv *env, jobject, jstring);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __gnu_java_awt_peer_gtk_GtkTextComponentPeer__ */
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
===================================================================
RCS file: 
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,v
retrieving revision 1.45
diff -u -r1.45 gnu_java_awt_peer_gtk_GtkComponentPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c        4 Jul 
2005 23:56:36 -0000       1.45
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c        5 Jul 
2005 05:41:40 -0000
@@ -1078,7 +1078,7 @@
 }
 
 void
-classpath_gtk_component_connect_nonfocus_signals (GObject *ptr, jobject *gref)
+classpath_gtk_component_connect_nonfocus_signals (GObject *ptr 
__attribute__((unused)), jobject *gref __attribute__((unused)))
  {
    /* FIXME */
 #if 0
@@ -1103,7 +1103,7 @@
 }
 
 void
-classpath_gtk_component_connect_signals (GObject *ptr, jobject *gref)
+classpath_gtk_component_connect_signals (GObject *ptr __attribute__((unused)), 
jobject *gref __attribute__((unused)))
 {
    /* FIXME */
 #if 0

signature.asc
Description: This is a digitally signed message part