Re: [cp-patches] [Patch]

[Mark Wielaard]

Hi Tom,

On Wed, 2006-02-15 at 13:30 -0500, Thomas Fitzsimmons wrote:
> > > A simpler fix and one more in line with the rest of the peer code is to
> > > change the added line to:
> > > 
> > > gtk_window_set_decorated (GTK_WINDOW (window), FALSE);
> > 
> > OK. I'll change it in a minute.
> > What is precisely the rational/rule here?
> 
> The GTK coding convention is to always use GtkWidgets and downcast when
> necessary.

Aha. OK, fixed as follows:

2006-02-15  Mark Wielaard  <[EMAIL PROTECTED]>

   * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c
   (Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_create):
   Downcast gtk_plug_new result when used.

Committed,

Mark

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c,v
retrieving revision 1.9
diff -u -r1.9 gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c	15 Feb 2006 12:09:06 -0000	1.9
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c	15 Feb 2006 18:55:47 -0000
@@ -44,16 +44,16 @@
 Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_create
   (JNIEnv *env, jobject obj, jlong socket_id)
 {
-  GtkWindow *window;
+  GtkWidget *window;
   GtkWidget *fixed;
 
   gdk_threads_enter ();
 
   NSA_SET_GLOBAL_REF (env, obj);
 
-  window = GTK_WINDOW (gtk_plug_new ((GdkNativeWindow) socket_id));
+  window = gtk_plug_new ((GdkNativeWindow) socket_id);
 
-  gtk_window_set_decorated (window, FALSE);
+  gtk_window_set_decorated (GTK_WINDOW (window), FALSE);
 
   fixed = gtk_fixed_new ();
   gtk_container_add (GTK_CONTAINER (window), fixed);

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