2005-07-14 Thomas Fitzsimmons <fitzsim@redhat.com>

	* gnu/java/awt/peer/gtk/GtkChoicePeer.java (choicePostItemEvent):
	Rename to postChoiceItemEvent.
	* gnu/java/awt/peer/gtk/GtkComponentPeer.java (realize): New method.
	(setNativeEventMask): Likewise.
	* gnu/java/awt/peer/gtk/GtkGenericPeer.java (printCurrentThread): New method.
	* gnu/java/awt/peer/gtk/GtkWindowPeer.java (realize): New method.
	* include/gnu_java_awt_peer_gtk_GtkComponentPeer.h: Regenerate.
	* include/gnu_java_awt_peer_gtk_GtkWindowPeer.h: Likewise.
	* native/jni/gtk-peer/gtkpeer.h: Move widget-specific macro,
	variable and function declarations into the widget-specific file.
	Add cp_gtk_ namespace prefix to external symbols.
	(cp_gtk_graphics2d_init_jni): New function.
	(cp_gtk_graphics_init_jni): Likewise.
	(cp_gtk_button_init_jni): Likewise.
	(cp_gtk_checkbox_init_jni): Likewise.
	(cp_gtk_choice_init_jni): Likewise.
	(cp_gtk_component_init_jni): Likewise.
	(cp_gtk_list_init_jni): Likewise.
	(cp_gtk_menuitem_init_jni): Likewise.
	(cp_gtk_scrollbar_init_jni): Likewise.
	(cp_gtk_textcomponent_init_jni): Likewise.
	(cp_gtk_window_init_jni): Likewise.
	(cp_gtk_component_connect_expose_signals): Likewise.
	(cp_gtk_component_connect_focus_signals): Likewise.
	(cp_gtk_component_connect_mouse_signals): Likewise.
	(cp_gtk_component_connect_signals): Likewise.
	(cp_gtk_textcomponent_connect_signals): Likewise.
	(cp_gtk_print_current_thread): Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c: Remove
	file.  Move widget-specific functions into the widget-specific
	files.  Break main event handler into multiple widget-specific
	callbacks.
	* native/jni/gtk-peer/Makefile.am (libgtkpeer_la_SOURCES): Remove
	gnu_java_awt_peer_gtk_GtkEvents.c.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c: Add
	cp_gtk_ namespace prefix to external symbols.  Add widget-specific
	macros, variables and function declarations from
	gnu_java_awt_peer_gtk_GtkEvents.c.  Add widget-specific callbacks
	to replace main event handling loop.
	* native/jni/classpath/native_state.c: Likewise.
	* native/jni/classpath/native_state.h: Likewise.
	* native/jni/gtk-peer/gdkfont.h: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkGenericPeer.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollbarPeer.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c: Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c: Likewise.
	* native/jni/gtk-peer/gthread-jni.c: Likewise.
	* native/jni/gtk-peer/gthread-jni.h: Likewise.

4 files changed, 19 insertions, 1 deletions

diff --git a/gnu/java/awt/peer/gtk/GtkChoicePeer.java b/gnu/java/awt/peer/gtk/GtkChoicePeer.java
index 16eedda47..5028ea779 100644
--- a/gnu/java/awt/peer/gtk/GtkChoicePeer.java
+++ b/gnu/java/awt/peer/gtk/GtkChoicePeer.java
@@ -120,7 +120,7 @@ public class GtkChoicePeer extends GtkComponentPeer
     add (item, position);
   }
 
-  protected void choicePostItemEvent (String label, int stateChange)
+  protected void postChoiceItemEvent (String label, int stateChange)
   {
     // Must set our state before notifying listeners
     if (stateChange == ItemEvent.SELECTED)
diff --git a/gnu/java/awt/peer/gtk/GtkComponentPeer.java b/gnu/java/awt/peer/gtk/GtkComponentPeer.java
index 099b7252d..1578a9cfc 100644
--- a/gnu/java/awt/peer/gtk/GtkComponentPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkComponentPeer.java
@@ -105,6 +105,13 @@ public class GtkComponentPeer extends GtkGenericPeer
 
   native boolean isRealized ();
 
+  void realize ()
+  {
+    // Default implementation does nothing
+  }
+
+  native void setNativeEventMask ();
+
   void create ()
   {
     throw new RuntimeException ();
@@ -137,6 +144,10 @@ public class GtkComponentPeer extends GtkGenericPeer
     if (awtComponent instanceof Window
         || (parent != null && ! parent.isShowing ()))
       setParentAndBounds ();
+
+    setNativeEventMask ();
+
+    realize ();
   }
 
   void setParentAndBounds ()
diff --git a/gnu/java/awt/peer/gtk/GtkGenericPeer.java b/gnu/java/awt/peer/gtk/GtkGenericPeer.java
index 669268e92..705eed235 100644
--- a/gnu/java/awt/peer/gtk/GtkGenericPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkGenericPeer.java
@@ -90,4 +90,9 @@ public class GtkGenericPeer
   }
 
   native void gtkWidgetModifyFont (String name, int style, int size);
+
+  static void printCurrentThread ()
+  {
+    System.out.println ("gtkgenericpeer, thread: " + Thread.currentThread ());
+  }
 }
diff --git a/gnu/java/awt/peer/gtk/GtkWindowPeer.java b/gnu/java/awt/peer/gtk/GtkWindowPeer.java
index bd16f3c76..71e05a87d 100644
--- a/gnu/java/awt/peer/gtk/GtkWindowPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkWindowPeer.java
@@ -63,6 +63,8 @@ public class GtkWindowPeer extends GtkContainerPeer
   native void gtkWindowSetResizable (boolean resizable);
   native void gtkWindowSetModal (boolean modal);
 
+  native void realize ();
+
   int getWidth ()
   {
     return awtComponent.getWidth();