forked from AuroraMiddleware/gtk
f83d57e91b
yeppers, accelerator changes to fix the gimp.
commit message dedicated to sopwith ;)
Thu Jun 18 03:30:06 1998 Tim Janik <timj@gtk.org>
* gtk/gtkaccellabel.h:
* gtk/gtkaccellabel.c: new function gtk_accel_label_accelerator_width to
request the size of the accelerator portion of an accel label.
(gtk_accel_label_size_request): don't request for the accelerators size.
(gtk_accel_label_expose_event): only draw the accelerator if we got
enough extra space.
* gtk/gtkmenuitem.c (gtk_menu_item_size_request): request accelerator
width from children.
* gtk/gtkmenu.c (gtk_menu_key_press): when adding an accelerator to an
object (after removal has been requested) check if there is still an
accelerator remaining to avoid adding two accelerators on an object.
this can happen for locked accelerators (or accelerator-frozen widgets).
(gtk_menu_size_request): feature childrens accelerator width in size
requests.
* gtk/gtknotebook.c (gtk_notebook_menu_item_create): use
gtk_widget_freeze_accelerators() for dynamically created menu items.
* gtk/gtksignal.h:
* gtk/gtksignal.c: new function gtk_signal_handler_pending_by_func()
which will return a handler_id > 0 if the specified function is pending
for `signal_id'.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: remove gtk_widget_stop_accelerator, which was just
a signal handler function to stop accelerator addition.
added gtk_widget_freeze_accelerators and gtk_widget_thaw_accelerators
which will prevent (undo) any accelerators from being added to or
removed from a widget.
94 lines
2.9 KiB
C
94 lines
2.9 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 Library 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
|
|
* Library General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Library 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.
|
|
*/
|
|
#ifndef __GTK_MENU_ITEM_H__
|
|
#define __GTK_MENU_ITEM_H__
|
|
|
|
|
|
#include <gdk/gdk.h>
|
|
#include <gtk/gtkitem.h>
|
|
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#pragma }
|
|
#endif /* __cplusplus */
|
|
|
|
|
|
#define GTK_TYPE_MENU_ITEM (gtk_menu_item_get_type ())
|
|
#define GTK_MENU_ITEM(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_MENU_ITEM, GtkMenuItem))
|
|
#define GTK_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_ITEM, GtkMenuItemClass))
|
|
#define GTK_IS_MENU_ITEM(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_MENU_ITEM))
|
|
#define GTK_IS_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_ITEM))
|
|
|
|
|
|
typedef struct _GtkMenuItem GtkMenuItem;
|
|
typedef struct _GtkMenuItemClass GtkMenuItemClass;
|
|
|
|
struct _GtkMenuItem
|
|
{
|
|
GtkItem item;
|
|
|
|
GtkWidget *submenu;
|
|
|
|
guint accelerator_signal;
|
|
guint16 toggle_size;
|
|
guint16 accelerator_width;
|
|
|
|
guint show_toggle_indicator : 1;
|
|
guint show_submenu_indicator : 1;
|
|
guint submenu_placement : 1;
|
|
guint submenu_direction : 1;
|
|
guint right_justify: 1;
|
|
guint timer;
|
|
};
|
|
|
|
struct _GtkMenuItemClass
|
|
{
|
|
GtkItemClass parent_class;
|
|
|
|
guint toggle_size;
|
|
|
|
void (* activate) (GtkMenuItem *menu_item);
|
|
};
|
|
|
|
|
|
GtkType gtk_menu_item_get_type (void);
|
|
GtkWidget* gtk_menu_item_new (void);
|
|
GtkWidget* gtk_menu_item_new_with_label (const gchar *label);
|
|
void gtk_menu_item_set_submenu (GtkMenuItem *menu_item,
|
|
GtkWidget *submenu);
|
|
void gtk_menu_item_remove_submenu (GtkMenuItem *menu_item);
|
|
void gtk_menu_item_set_placement (GtkMenuItem *menu_item,
|
|
GtkSubmenuPlacement placement);
|
|
void gtk_menu_item_configure (GtkMenuItem *menu_item,
|
|
gint show_toggle_indicator,
|
|
gint show_submenu_indicator);
|
|
void gtk_menu_item_select (GtkMenuItem *menu_item);
|
|
void gtk_menu_item_deselect (GtkMenuItem *menu_item);
|
|
void gtk_menu_item_activate (GtkMenuItem *menu_item);
|
|
void gtk_menu_item_right_justify (GtkMenuItem *menu_item);
|
|
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif /* __cplusplus */
|
|
|
|
|
|
#endif /* __GTK_MENU_ITEM_H__ */
|