forked from AuroraMiddleware/gtk
814957b46e
2000-11-08 Alexander Larsson <alexl@redhat.com> * docs/Changes-2.0.txt: Add note about GtkMenuPositionFunc API changes. * gtk/gtkmenu.c: Add support for scrolling menus. Remove gtk_menu_append/prepend/insert, these have been moved to gtkcompat.h as #defines. * gtk/gtkcompat.h.in: Add compatibility #defines for gtk_menu_append/prepend/insert * gtk/gtkmenu.h: Add data needed for scrolling menus. GtkMenuPositionFunc gets an extra argument push_in. gtk_menu_append/prepend/insert removed. * gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Change menu positioning behaviour to fit to scrolling menus. * gtk/gtkmenuitem.c (gtk_menu_item_forall): Don't recurse into menuitem->submeny. That is wrong, and broke torn off submenus of torn off menus, since they were unrealized when the first menu was unrealized. * gtk/gtkmenushell.[ch]: Virtualize gtk_menu_shell_insert() and gtk_menu_shell_select_item() since these need to be overridden in GtkMenu. * gtk/gtkoptionmenu.c (gtk_opttion_menu_position): Change menu positioning behaviour to fit to scrolling menus. (gtk_option_menu_key_press, gtk_option_menu_button_press): Select the current item so that it is prelighted when the menu pops up. This is a workaround to the fact that the menu doesn't get the initial enter event (due to grabs). * gtk/gtkfilesel.c, gtk/gtkinputdialog.c, gtk/testgtk.c: s/gtk_menu_append/gtk_menu_shell_append/ * gtk/gtknotebook.c: s/gtk_menu_insert/gtk_menu_shell_insert/ * gtk/testgtk.c (create_menu, create_menus): Create the first menu with 50 items so that menu scrolling can be tested. Patch from Jonathan Blandford <jrb@redhat.com> * gtk/gtkmenuitem.[ch] (gtk_menu_item_toggle_size_request): new system to handle size requests. First, we ask what the size of the toggle is. Then, when allocating the size, we allocate the toggle_size first. This way we can have multiple menu-item classes w/o needing a seperate class for each. * gtk/gtkmenu.c (gtk_menu_size_request): Actually use the new system. * gtk/gtkmenu.c (gtk_menu_size_allocate): Use the new system. * gtk/gtkcheckmenuitem.c (gtk_check_menu_item_toggle_size_request): New function to handle the toggle size-request.
115 lines
3.6 KiB
C
115 lines
3.6 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) (GTK_CHECK_CAST ((obj), GTK_TYPE_MENU_SHELL, GtkMenuShell))
|
|
#define GTK_MENU_SHELL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_SHELL, GtkMenuShellClass))
|
|
#define GTK_IS_MENU_SHELL(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_MENU_SHELL))
|
|
#define GTK_IS_MENU_SHELL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_SHELL))
|
|
#define GTK_MENU_SHELL_GET_CLASS(obj) (GTK_CHECK_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 active : 1;
|
|
guint have_grab : 1;
|
|
guint have_xgrab : 1;
|
|
guint button : 2;
|
|
guint ignore_leave : 1;
|
|
guint menu_flag : 1;
|
|
guint ignore_enter : 1;
|
|
|
|
guint32 activate_time;
|
|
};
|
|
|
|
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);
|
|
};
|
|
|
|
|
|
GtkType 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);
|
|
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif /* __cplusplus */
|
|
|
|
|
|
#endif /* __GTK_MENU_SHELL_H__ */
|