1 files changed, 27 insertions, 1 deletions

diff --git a/libjava/classpath/native/jni/gtk-peer/gtkpeer.h b/libjava/classpath/native/jni/gtk-peer/gtkpeer.h
index f291d82ef4b..2b16d99b455 100644
--- a/libjava/classpath/native/jni/gtk-peer/gtkpeer.h
+++ b/libjava/classpath/native/jni/gtk-peer/gtkpeer.h
@@ -83,6 +83,20 @@ extern struct state_table *cp_gtk_native_global_ref_table;
     (*env)->DeleteGlobalRef (env, *globRefPtr); \
     free (globRefPtr);} while (0)
 
+extern struct state_table *cp_gtk_native_graphics_state_table;
+
+#define NSA_G_INIT(env, clazz) \
+  cp_gtk_native_graphics_state_table = cp_gtk_init_state_table (env, clazz)
+
+#define NSA_GET_G_PTR(env, obj) \
+  cp_gtk_get_state (env, obj, cp_gtk_native_graphics_state_table)
+
+#define NSA_SET_G_PTR(env, obj, ptr) \
+  cp_gtk_set_state (env, obj, cp_gtk_native_graphics_state_table, (void *)ptr)
+
+#define NSA_DEL_G_PTR(env, obj) \
+  cp_gtk_remove_state_slot (env, obj, cp_gtk_native_graphics_state_table)
+
 #define SWAPU32(w)							\
   (((w) << 24) | (((w) & 0xff00) << 8) | (((w) >> 8) & 0xff00) | ((w) >> 24))
 
@@ -142,6 +156,14 @@ JNIEnv *cp_gtk_gdk_env(void);
 extern double cp_gtk_dpi_conversion_factor;
 extern GtkWindowGroup *cp_gtk_global_window_group;
 
+/* Shared global clipboard for GtkClipboard and GtkSelection. */
+extern GtkClipboard *cp_gtk_clipboard;
+
+/* Standard target (strings) for GtkClipboard and GtkSelection. */
+extern jstring cp_gtk_stringTarget;
+extern jstring cp_gtk_imageTarget;
+extern jstring cp_gtk_filesTarget;
+
 /* Union used for type punning. */
 union widget_union
 {
@@ -149,8 +171,9 @@ union widget_union
   GtkWidget **widget;
 };
 
-/* Keycode helpers */
+/* Constant conversion helpers */
 guint cp_gtk_awt_keycode_to_keysym (jint keyCode, jint keyLocation);
+jint cp_gtk_state_to_awt_mods (guint state);
 
 /* Image helpers */
 GdkPixbuf *cp_gtk_image_get_pixbuf (JNIEnv *env, jobject obj);
@@ -166,6 +189,7 @@ void cp_gtk_button_init_jni (void);
 void cp_gtk_checkbox_init_jni (void);
 void cp_gtk_choice_init_jni (void);
 void cp_gtk_component_init_jni (void);
+void cp_gtk_filedialog_init_jni (void);
 void cp_gtk_list_init_jni (void);
 void cp_gtk_menuitem_init_jni (void);
 void cp_gtk_scrollbar_init_jni (void);
@@ -182,6 +206,8 @@ void cp_gtk_textcomponent_connect_signals (GObject *ptr, jobject *gref);
 /* Debugging */
 void cp_gtk_print_current_thread (void);
 
+#define SYNCHRONIZE_GDK 0
+
 #define DEBUG_LOCKING 0
 
 #if DEBUG_LOCKING