Commit e4b73d8a authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Fix prototype for activate_key. (#108927, Jason D. Hildebrand)

Mon Apr 21 19:02:16 2003  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtksocket.c (activate_key): Fix prototype for
        activate_key. (#108927, Jason D. Hildebrand)
parent c40ab61e
Mon Apr 21 19:02:16 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (activate_key): Fix prototype for
activate_key. (#108927, Jason D. Hildebrand)
Mon Apr 21 18:42:51 2003 Owen Taylor <otaylor@redhat.com>
* demos/gtk-demo/Makefile.am demos/gtk-demo/geninclude.pl:
......
Mon Apr 21 19:02:16 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (activate_key): Fix prototype for
activate_key. (#108927, Jason D. Hildebrand)
Mon Apr 21 18:42:51 2003 Owen Taylor <otaylor@redhat.com>
* demos/gtk-demo/Makefile.am demos/gtk-demo/geninclude.pl:
......
Mon Apr 21 19:02:16 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (activate_key): Fix prototype for
activate_key. (#108927, Jason D. Hildebrand)
Mon Apr 21 18:42:51 2003 Owen Taylor <otaylor@redhat.com>
* demos/gtk-demo/Makefile.am demos/gtk-demo/geninclude.pl:
......
Mon Apr 21 19:02:16 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (activate_key): Fix prototype for
activate_key. (#108927, Jason D. Hildebrand)
Mon Apr 21 18:42:51 2003 Owen Taylor <otaylor@redhat.com>
* demos/gtk-demo/Makefile.am demos/gtk-demo/geninclude.pl:
......
Mon Apr 21 19:02:16 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtksocket.c (activate_key): Fix prototype for
activate_key. (#108927, Jason D. Hildebrand)
Mon Apr 21 18:42:51 2003 Owen Taylor <otaylor@redhat.com>
* demos/gtk-demo/Makefile.am demos/gtk-demo/geninclude.pl:
......
......@@ -562,15 +562,19 @@ typedef struct
GdkModifierType accel_mods;
} GrabbedKey;
static void
activate_key (GtkAccelGroup *accel_group,
GrabbedKey *grabbed_key)
static gboolean
activate_key (GtkAccelGroup *accel_group,
GObject *acceleratable,
guint accel_key,
GdkModifierType accel_mods,
GrabbedKey *grabbed_key)
{
XEvent xevent;
GdkEvent *gdk_event = gtk_get_current_event ();
GtkSocket *socket = g_object_get_data (G_OBJECT (accel_group), "gtk-socket");
GdkScreen *screen = gdk_drawable_get_screen (socket->plug_window);
gboolean retval = FALSE;
if (gdk_event && gdk_event->type == GDK_KEY_PRESS && socket->plug_window)
{
......@@ -593,10 +597,14 @@ activate_key (GtkAccelGroup *accel_group,
False, KeyPressMask, &xevent);
gdk_display_sync (gdk_screen_get_display (screen));
gdk_error_trap_pop ();
retval = TRUE;
}
if (gdk_event)
gdk_event_free (gdk_event);
return retval;
}
static gboolean
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment