export gtk_window_activate_key() (Request from Tim Janik)

Sun Feb 29 20:34:06 2004  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkwindow.[ch] gtk/gtkmenushell.c: export
        gtk_window_activate_key() (Request from Tim Janik)
This commit is contained in:
Owen Taylor 2004-03-01 01:41:17 +00:00 committed by Owen Taylor
parent 244be2043d
commit 6062e54945
9 changed files with 38 additions and 8 deletions

View File

@ -1,3 +1,8 @@
Sun Feb 29 20:34:06 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.[ch] gtk/gtkmenushellx.c: export
gtk_window_activate_key() (Request from Tim Janik)
Mon Mar 1 01:00:11 2004 Matthias Clasen <maclas@gmx.de> Mon Mar 1 01:00:11 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktextview.c (gtk_text_view_drag_data_received): * gtk/gtktextview.c (gtk_text_view_drag_data_received):

View File

@ -1,3 +1,8 @@
Sun Feb 29 20:34:06 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.[ch] gtk/gtkmenushellx.c: export
gtk_window_activate_key() (Request from Tim Janik)
Mon Mar 1 01:00:11 2004 Matthias Clasen <maclas@gmx.de> Mon Mar 1 01:00:11 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktextview.c (gtk_text_view_drag_data_received): * gtk/gtktextview.c (gtk_text_view_drag_data_received):

View File

@ -1,3 +1,8 @@
Sun Feb 29 20:34:06 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.[ch] gtk/gtkmenushellx.c: export
gtk_window_activate_key() (Request from Tim Janik)
Mon Mar 1 01:00:11 2004 Matthias Clasen <maclas@gmx.de> Mon Mar 1 01:00:11 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktextview.c (gtk_text_view_drag_data_received): * gtk/gtktextview.c (gtk_text_view_drag_data_received):

View File

@ -1,3 +1,8 @@
Sun Feb 29 20:34:06 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.[ch] gtk/gtkmenushellx.c: export
gtk_window_activate_key() (Request from Tim Janik)
Mon Mar 1 01:00:11 2004 Matthias Clasen <maclas@gmx.de> Mon Mar 1 01:00:11 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktextview.c (gtk_text_view_drag_data_received): * gtk/gtktextview.c (gtk_text_view_drag_data_received):

View File

@ -1,3 +1,8 @@
Sun Feb 29 20:34:06 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.[ch] gtk/gtkmenushellx.c: export
gtk_window_activate_key() (Request from Tim Janik)
Mon Mar 1 01:00:11 2004 Matthias Clasen <maclas@gmx.de> Mon Mar 1 01:00:11 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktextview.c (gtk_text_view_drag_data_received): * gtk/gtktextview.c (gtk_text_view_drag_data_received):

View File

@ -4380,6 +4380,7 @@ gtk_window_list_toplevels
gtk_window_add_mnemonic gtk_window_add_mnemonic
gtk_window_remove_mnemonic gtk_window_remove_mnemonic
gtk_window_mnemonic_activate gtk_window_mnemonic_activate
gtk_window_activate_key
gtk_window_get_focus gtk_window_get_focus
gtk_window_set_focus gtk_window_set_focus
gtk_window_set_default gtk_window_set_default

View File

@ -585,7 +585,7 @@ gtk_menu_shell_key_press (GtkWidget *widget,
toplevel = gtk_widget_get_toplevel (widget); toplevel = gtk_widget_get_toplevel (widget);
if (GTK_IS_WINDOW (toplevel) && if (GTK_IS_WINDOW (toplevel) &&
_gtk_window_activate_key (GTK_WINDOW (toplevel), event)) gtk_window_activate_key (GTK_WINDOW (toplevel), event))
return TRUE; return TRUE;
return FALSE; return FALSE;

View File

@ -4198,7 +4198,7 @@ gtk_window_key_press_event (GtkWidget *widget,
/* Check for mnemonics and accelerators /* Check for mnemonics and accelerators
*/ */
if (!handled) if (!handled)
handled = _gtk_window_activate_key (window, event); handled = gtk_window_activate_key (window, event);
if (!handled) if (!handled)
{ {
@ -7067,17 +7067,20 @@ gtk_window_free_key_hash (GtkWindow *window)
} }
/** /**
* _gtk_window_activate_key: * gtk_window_activate_key:
* @window: a #GtkWindow * @window: a #GtkWindow
* @event: a #GdkEventKey * @event: a #GdkEventKey
* *
* Activates mnemonics and accelerators for this #GtKWindow * Activates mnemonics and accelerators for this #GtkWindow. This is normally
* called by the default ::key_press_event handler for toplevel windows,
* however in some cases it may be useful to call this directly when
* overriding the standard key handling for a toplevel window.
* *
* Return value: %TRUE if a mnemonic or accelerator was found and activated. * Return value: %TRUE if a mnemonic or accelerator was found and activated.
**/ **/
gboolean gboolean
_gtk_window_activate_key (GtkWindow *window, gtk_window_activate_key (GtkWindow *window,
GdkEventKey *event) GdkEventKey *event)
{ {
GtkKeyHash *key_hash = g_object_get_data (G_OBJECT (window), "gtk-window-key-hash"); GtkKeyHash *key_hash = g_object_get_data (G_OBJECT (window), "gtk-window-key-hash");
GtkWindowKeyEntry *found_entry = NULL; GtkWindowKeyEntry *found_entry = NULL;

View File

@ -285,6 +285,9 @@ void gtk_window_set_mnemonic_modifier (GtkWindow *window,
GdkModifierType modifier); GdkModifierType modifier);
GdkModifierType gtk_window_get_mnemonic_modifier (GtkWindow *window); GdkModifierType gtk_window_get_mnemonic_modifier (GtkWindow *window);
gboolean gtk_window_activate_key (GtkWindow *window,
GdkEventKey *event);
void gtk_window_present (GtkWindow *window); void gtk_window_present (GtkWindow *window);
void gtk_window_iconify (GtkWindow *window); void gtk_window_iconify (GtkWindow *window);
void gtk_window_deiconify (GtkWindow *window); void gtk_window_deiconify (GtkWindow *window);
@ -370,8 +373,6 @@ void _gtk_window_constrain_size (GtkWindow *window,
gint *new_width, gint *new_width,
gint *new_height); gint *new_height);
GtkWindowGroup *_gtk_window_get_group (GtkWindow *window); GtkWindowGroup *_gtk_window_get_group (GtkWindow *window);
gboolean _gtk_window_activate_key (GtkWindow *window,
GdkEventKey *event);
void _gtk_window_set_has_toplevel_focus (GtkWindow *window, void _gtk_window_set_has_toplevel_focus (GtkWindow *window,
gboolean has_toplevel_focus); gboolean has_toplevel_focus);