fixed an assertment.

Sat Jun  6 06:01:24 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtksignal.c (gtk_signal_emitv): fixed an assertment.

        * gtk/makeenums.awk: a script to generate the GtkEnumValue arrays from,
        this should eventually be done by gentypeinfo.el somewhen.
        * gtk/gtkenumvalues.c: new generated file to hold GtkEnumValue arrays.

        * gtk/gtktypeutils.h: new function gtk_enum_values() to retrive all the
        enum values of an enum type.

        * gtk/gtk.defs:
        * gtk/gtkcurve.h:
        * gtk/gtkobject.h:
        * gtk/gtkprivate.h:
        * gtk/gtkwidget.h:
        * gtk/gtkenums.h:
        brought enum/flags definitions in sync, added a few more enum
        definitions for bindings and pattern matching.

        * some more macro and GtkType fixups in various places.

        * gdk/gdktypes.h (enum): added a new value GDK_AFTER_MASK, which is used
        as a key-release modifier for the binding system.

Fri Jun  5 06:06:06 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtkmenu.h (struct _GtkMenu): removed GList*children, since it
        was a stale list pointer that is already present in GtkMenuShell.

        * gtk/gtkmenushell.h (struct _GtkMenuShellClass): added a signal
        GtkMenuShell::selection_done which is emitted after the menu shell
        poped down again and all possible menu items have been activated.

Thu Jun  4 02:20:42 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtkmenushell.c (gtk_menu_shell_button_release): flush the x-queue
        before activation of the menuitem, so the menu is actually taken off the
        screen prior to any menu item activation.

        * gtk/gtkctree.c (gtk_ctree_get_row_data): allow function invokation
        for NULL nodes.

        * gtk/gtkwidget.h:
        * gtk/gtkwidget.c: new function gtk_widget_stop_accelerator to stop
        the emission of the "add-accelerator" signal on a widget. this is
        usefull to prevent accelerator installation on certain widgets.

        * gtk/gtknotebook.c (gtk_notebook_menu_item_create): keep the menu
        labels left justified, by setting their alignment. stop accelerator
        installation for the menu items, since we use dynamic menus.

Wed Jun  3 06:41:22 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtkmenufactory.c: adaptions to use the new accel groups. people
        should *really* use GtkItemFactory. this is only for preserving source
        compatibility where possible, use of GtkMenuFactory is deprecated as of
        now.

        * gtk/gtkobject.h (gtk_object_class_add_user_signal): new function
        to create user signals of type GTK_RUN_NO_RECURSE. don't know why i
        missed this possibility when i added gtk_object_class_add_user_signal
        in late january.

        * gtk/gtkmain.c (gtk_init): ignore subsequent function calls.

Sun May 31 07:31:09 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtkaccelgroup.h:
        * gtk/gtkaccelgroup.c: new implementation of the accelerator concept.

        * gtk/gtkaccellabel.h:
        * gtk/gtkaccellabel.c: new widget derived from GtkLabel whitch features
        display of the accelerators associated with a certain widget.

        * gtk/gtkitemfactory.h:
        * gtk/gtkitemfactory.c: new widget, item factory with automatic rc
        parsing and accelerator handling.

        * gtk/gtkmenu.c (gtk_menu_reposition): new function to care for
        positioning a menu.
        (gtk_menu_map): removed the allocation code.
        (gtk_menu_size_allocate): care for redrawing of children and resize
        our widget->window correctly.
        (gtk_menu_key_press): feature the new accelerator groups.

        * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): reposition the
        submenu if neccessary.

        * gtk/gtkmenuitem.c:
        * gtk/gtkcheckmenuitem.c:
        * gtk/gtkradiomenuitem.c: use GtkAccelLabel in the *_new_with_label()
        function variants.

        * gdk/gdk.c:
        (gdk_keyval_from_name):
        (gdk_keyval_name): new functions for keyval<->key-name associations.
        (gdk_keyval_to_upper):
        (gdk_keyval_to_lower):
        (gdk_keyval_is_upper):
        (gdk_keyval_is_lower): new functions to check/translate keyvalues with
        regards to their cases.

Wed May 27 00:48:10 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtkwidget.c (gtk_widget_class_path): new function to calculate a
        widget's class path.
        (gtk_widget_path): new function to calculate a widget's name path.

        * gtk/gtkrc.c: newly introduced GtkPatternSpec structures to speed up
        pattern matching, features reversed pattern matches.

1 files changed, 36 insertions, 34 deletions

diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h
index 23a8a6c009..ac47f54baf 100644
--- a/gtk/gtkmenu.h
+++ b/gtk/gtkmenu.h
@@ -8,7 +8,7 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
@@ -21,40 +21,41 @@
 
 
 #include <gdk/gdk.h>
-#include <gtk/gtkaccelerator.h>
+#include <gtk/gtkaccelgroup.h>
 #include <gtk/gtkmenushell.h>
 
 
 #ifdef __cplusplus
 extern "C" {
+#pragma }
 #endif /* __cplusplus */
 
 
-#define GTK_MENU(obj)          GTK_CHECK_CAST (obj, gtk_menu_get_type (), GtkMenu)
-#define GTK_MENU_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_menu_get_type (), GtkMenuClass)
-#define GTK_IS_MENU(obj)       GTK_CHECK_TYPE (obj, gtk_menu_get_type ())
+#define GTK_TYPE_MENU			(gtk_menu_get_type ())
+#define GTK_MENU(obj)			(GTK_CHECK_CAST ((obj), GTK_TYPE_MENU, GtkMenu))
+#define GTK_MENU_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU, GtkMenuClass))
+#define GTK_IS_MENU(obj)		(GTK_CHECK_TYPE ((obj), GTK_TYPE_MENU))
+#define GTK_IS_MENU_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU))
 
 
-typedef struct _GtkMenu       GtkMenu;
+typedef struct _GtkMenu	      GtkMenu;
 typedef struct _GtkMenuClass  GtkMenuClass;
 
 typedef void (*GtkMenuPositionFunc) (GtkMenu   *menu,
 				     gint      *x,
 				     gint      *y,
-				     gpointer   user_data);
+				     gpointer	user_data);
 typedef void (*GtkMenuDetachFunc)   (GtkWidget *attach_widget,
 				     GtkMenu   *menu);
 
 struct _GtkMenu
 {
   GtkMenuShell menu_shell;
-
-  GList *children;
-
+  
   GtkWidget *parent_menu_item;
   GtkWidget *old_active_menu_item;
-
-  GtkAcceleratorTable *accelerator_table;
+  
+  GtkAccelGroup *accel_group;
   GtkMenuPositionFunc position_func;
   gpointer position_func_data;
 };
@@ -65,28 +66,29 @@ struct _GtkMenuClass
 };
 
 
-guint      gtk_menu_get_type              (void);
-GtkWidget* gtk_menu_new                   (void);
-void       gtk_menu_append                (GtkMenu             *menu,
-					   GtkWidget           *child);
-void       gtk_menu_prepend               (GtkMenu             *menu,
-					   GtkWidget           *child);
-void       gtk_menu_insert                (GtkMenu             *menu,
-					   GtkWidget           *child,
-					   gint                 position);
-void       gtk_menu_popup                 (GtkMenu             *menu,
-					   GtkWidget           *parent_menu_shell,
-					   GtkWidget           *parent_menu_item,
-					   GtkMenuPositionFunc  func,
-					   gpointer             data,
-					   guint                button,
-					   guint32              activate_time);
-void       gtk_menu_popdown               (GtkMenu             *menu);
-GtkWidget* gtk_menu_get_active            (GtkMenu             *menu);
-void       gtk_menu_set_active            (GtkMenu             *menu,
-					   guint                index);
-void       gtk_menu_set_accelerator_table (GtkMenu             *menu,
-					   GtkAcceleratorTable *table);
+GtkType	   gtk_menu_get_type		  (void);
+GtkWidget* gtk_menu_new			  (void);
+void	   gtk_menu_append		  (GtkMenu	       *menu,
+					   GtkWidget	       *child);
+void	   gtk_menu_prepend		  (GtkMenu	       *menu,
+					   GtkWidget	       *child);
+void	   gtk_menu_insert		  (GtkMenu	       *menu,
+					   GtkWidget	       *child,
+					   gint			position);
+void	   gtk_menu_popup		  (GtkMenu	       *menu,
+					   GtkWidget	       *parent_menu_shell,
+					   GtkWidget	       *parent_menu_item,
+					   GtkMenuPositionFunc	func,
+					   gpointer		data,
+					   guint		button,
+					   guint32		activate_time);
+void	   gtk_menu_reposition		  (GtkMenu	       *menu);
+void	   gtk_menu_popdown		  (GtkMenu	       *menu);
+GtkWidget* gtk_menu_get_active		  (GtkMenu	       *menu);
+void	   gtk_menu_set_active		  (GtkMenu	       *menu,
+					   guint		index);
+void	   gtk_menu_set_accel_group	  (GtkMenu	       *menu,
+					   GtkAccelGroup       *accel_group);
 void	   gtk_menu_attach_to_widget	  (GtkMenu	       *menu,
 					   GtkWidget	       *attach_widget,
 					   GtkMenuDetachFunc	detacher);