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)

diff --git a/ChangeLog b/ChangeLog
index 36c6373e4bea025b73ef373dacac068536c18e63..4e73b4271e4b3b96987dc8e7fa12ecfc0c10fa36 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * gtk/gtktextview.c (gtk_text_view_drag_data_received): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 36c6373e4bea025b73ef373dacac068536c18e63..4e73b4271e4b3b96987dc8e7fa12ecfc0c10fa36 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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>
 
        * gtk/gtktextview.c (gtk_text_view_drag_data_received): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 36c6373e4bea025b73ef373dacac068536c18e63..4e73b4271e4b3b96987dc8e7fa12ecfc0c10fa36 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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>
 
        * gtk/gtktextview.c (gtk_text_view_drag_data_received): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 36c6373e4bea025b73ef373dacac068536c18e63..4e73b4271e4b3b96987dc8e7fa12ecfc0c10fa36 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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>
 
        * gtk/gtktextview.c (gtk_text_view_drag_data_received): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 36c6373e4bea025b73ef373dacac068536c18e63..4e73b4271e4b3b96987dc8e7fa12ecfc0c10fa36 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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>
 
        * gtk/gtktextview.c (gtk_text_view_drag_data_received): 

diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 1c757027c8bf2525c6e5d0c87a2b4c1f1032b581..55932c04095d18b22547a2a7ac7c3a4463ef1a54 100644 (file)
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -4380,6 +4380,7 @@ gtk_window_list_toplevels
 gtk_window_add_mnemonic
 gtk_window_remove_mnemonic
 gtk_window_mnemonic_activate
+gtk_window_activate_key
 gtk_window_get_focus
 gtk_window_set_focus
 gtk_window_set_default

diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 514d9b5aa6e3cd535af5f0b7e0b8f93ed9680e68..b90709152355a525fa23ca14c45583a5c248f4d2 100644 (file)
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -585,7 +585,7 @@ gtk_menu_shell_key_press (GtkWidget *widget,
 
   toplevel = gtk_widget_get_toplevel (widget);
   if (GTK_IS_WINDOW (toplevel) &&
-      _gtk_window_activate_key (GTK_WINDOW (toplevel), event))
+      gtk_window_activate_key (GTK_WINDOW (toplevel), event))
     return TRUE;
 
   return FALSE;

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 0e3c5f3db1cc0921a87bc039f9be08bd1e8ee8be..034edf240a4249b461a15a0cabf61a24299d2ed8 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -4198,7 +4198,7 @@ gtk_window_key_press_event (GtkWidget   *widget,
   /* Check for mnemonics and accelerators
    */
   if (!handled)
-    handled = _gtk_window_activate_key (window, event);
+    handled = gtk_window_activate_key (window, event);
 
   if (!handled)
     {
@@ -7067,17 +7067,20 @@ gtk_window_free_key_hash (GtkWindow *window)
 }
 
 /**
- * _gtk_window_activate_key:
+ * gtk_window_activate_key:
  * @window: a #GtkWindow
  * @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.
  **/
 gboolean
-_gtk_window_activate_key (GtkWindow   *window,
-                         GdkEventKey *event)
+gtk_window_activate_key (GtkWindow   *window,
+                        GdkEventKey *event)
 {
   GtkKeyHash *key_hash = g_object_get_data (G_OBJECT (window), "gtk-window-key-hash");
   GtkWindowKeyEntry *found_entry = NULL;

diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 439a5cefe5ed2aadac51cfc8c76b04762bcf04a7..0b0c163b426bdc8f154f8cf035153b1b742f9884 100644 (file)
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -285,6 +285,9 @@ void     gtk_window_set_mnemonic_modifier (GtkWindow       *window,
                                           GdkModifierType  modifier);
 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_iconify       (GtkWindow *window);
 void     gtk_window_deiconify     (GtkWindow *window);
@@ -370,8 +373,6 @@ void            _gtk_window_constrain_size     (GtkWindow *window,
                                                gint      *new_width,
                                                gint      *new_height);
 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,
                                                    gboolean   has_toplevel_focus);