forked from AuroraMiddleware/gtk
3895bea4df
Sun Mar 14 19:26:48 2004 Owen Taylor <otaylor@redhat.com>
#136672, reported by Christian Persch; fixes based
on a patch by Soeren Sandmann.
* gtk/gtkmenu.c: Change the handling of mixed gridded
and non-gridded menu items; the old method was causing
major performance problems even with the "avoid relayout
on destruction" hack put in recently.
Now we first lay out the gridded items and then put the
non-gridded items into empty rows / after the gridded items.
Layout is done in a central menu_shell_ensure_layout(). Also
avoid emitting property notifications when we initially
insert or attach items.
* gtk/gtkmenushell.[ch] gtk/gtkmenu.c: Stop setting the
unused menu_shell->menu_flag, and document it as unused
in the header.
* tests/testactions.c: Add a test of creating/removing
lots of items.
* test/testgtk.c: Add some more cruft to the menu test.
127 lines
4.3 KiB
C
127 lines
4.3 KiB
C
/* GTK - The GIMP Toolkit
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* 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
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
* Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
/*
|
|
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
|
|
* file for a list of people on the GTK+ Team. See the ChangeLog
|
|
* files for a list of changes. These files are distributed with
|
|
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
|
*/
|
|
|
|
#ifndef __GTK_MENU_SHELL_H__
|
|
#define __GTK_MENU_SHELL_H__
|
|
|
|
|
|
#include <gdk/gdk.h>
|
|
#include <gtk/gtkcontainer.h>
|
|
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif /* __cplusplus */
|
|
|
|
|
|
#define GTK_TYPE_MENU_SHELL (gtk_menu_shell_get_type ())
|
|
#define GTK_MENU_SHELL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_SHELL, GtkMenuShell))
|
|
#define GTK_MENU_SHELL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_SHELL, GtkMenuShellClass))
|
|
#define GTK_IS_MENU_SHELL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_SHELL))
|
|
#define GTK_IS_MENU_SHELL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_SHELL))
|
|
#define GTK_MENU_SHELL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MENU_SHELL, GtkMenuShellClass))
|
|
|
|
|
|
typedef struct _GtkMenuShell GtkMenuShell;
|
|
typedef struct _GtkMenuShellClass GtkMenuShellClass;
|
|
|
|
struct _GtkMenuShell
|
|
{
|
|
GtkContainer container;
|
|
|
|
GList *children;
|
|
GtkWidget *active_menu_item;
|
|
GtkWidget *parent_menu_shell;
|
|
|
|
guint button;
|
|
guint32 activate_time;
|
|
|
|
guint active : 1;
|
|
guint have_grab : 1;
|
|
guint have_xgrab : 1;
|
|
guint ignore_leave : 1; /* unused */
|
|
guint menu_flag : 1; /* unused */
|
|
guint ignore_enter : 1;
|
|
};
|
|
|
|
struct _GtkMenuShellClass
|
|
{
|
|
GtkContainerClass parent_class;
|
|
|
|
guint submenu_placement : 1;
|
|
|
|
void (*deactivate) (GtkMenuShell *menu_shell);
|
|
void (*selection_done) (GtkMenuShell *menu_shell);
|
|
|
|
void (*move_current) (GtkMenuShell *menu_shell,
|
|
GtkMenuDirectionType direction);
|
|
void (*activate_current) (GtkMenuShell *menu_shell,
|
|
gboolean force_hide);
|
|
void (*cancel) (GtkMenuShell *menu_shell);
|
|
void (*select_item) (GtkMenuShell *menu_shell,
|
|
GtkWidget *menu_item);
|
|
void (*insert) (GtkMenuShell *menu_shell,
|
|
GtkWidget *child,
|
|
gint position);
|
|
gint (*get_popup_delay) (GtkMenuShell *menu_shell);
|
|
|
|
/* Padding for future expansion */
|
|
void (*_gtk_reserved1) (void);
|
|
void (*_gtk_reserved2) (void);
|
|
void (*_gtk_reserved3) (void);
|
|
};
|
|
|
|
|
|
GType gtk_menu_shell_get_type (void) G_GNUC_CONST;
|
|
void gtk_menu_shell_append (GtkMenuShell *menu_shell,
|
|
GtkWidget *child);
|
|
void gtk_menu_shell_prepend (GtkMenuShell *menu_shell,
|
|
GtkWidget *child);
|
|
void gtk_menu_shell_insert (GtkMenuShell *menu_shell,
|
|
GtkWidget *child,
|
|
gint position);
|
|
void gtk_menu_shell_deactivate (GtkMenuShell *menu_shell);
|
|
void gtk_menu_shell_select_item (GtkMenuShell *menu_shell,
|
|
GtkWidget *menu_item);
|
|
void gtk_menu_shell_deselect (GtkMenuShell *menu_shell);
|
|
void gtk_menu_shell_activate_item (GtkMenuShell *menu_shell,
|
|
GtkWidget *menu_item,
|
|
gboolean force_deactivate);
|
|
void gtk_menu_shell_select_first (GtkMenuShell *menu_shell,
|
|
gboolean search_sensitive);
|
|
void _gtk_menu_shell_select_last (GtkMenuShell *menu_shell,
|
|
gboolean search_sensitive);
|
|
void _gtk_menu_shell_activate (GtkMenuShell *menu_shell);
|
|
gint _gtk_menu_shell_get_popup_delay (GtkMenuShell *menu_shell);
|
|
void gtk_menu_shell_cancel (GtkMenuShell *menu_shell);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif /* __cplusplus */
|
|
|
|
|
|
#endif /* __GTK_MENU_SHELL_H__ */
|