forked from AuroraMiddleware/gtk
a391196ba5
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.
278 lines
7.3 KiB
C
278 lines
7.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 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.
|
|
*/
|
|
#include "gtkaccellabel.h"
|
|
#include "gtkradiomenuitem.h"
|
|
|
|
|
|
static void gtk_radio_menu_item_class_init (GtkRadioMenuItemClass *klass);
|
|
static void gtk_radio_menu_item_init (GtkRadioMenuItem *radio_menu_item);
|
|
static void gtk_radio_menu_item_activate (GtkMenuItem *menu_item);
|
|
static void gtk_radio_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
|
|
GdkRectangle *area);
|
|
|
|
|
|
guint
|
|
gtk_radio_menu_item_get_type (void)
|
|
{
|
|
static guint radio_menu_item_type = 0;
|
|
|
|
if (!radio_menu_item_type)
|
|
{
|
|
GtkTypeInfo radio_menu_item_info =
|
|
{
|
|
"GtkRadioMenuItem",
|
|
sizeof (GtkRadioMenuItem),
|
|
sizeof (GtkRadioMenuItemClass),
|
|
(GtkClassInitFunc) gtk_radio_menu_item_class_init,
|
|
(GtkObjectInitFunc) gtk_radio_menu_item_init,
|
|
(GtkArgSetFunc) NULL,
|
|
(GtkArgGetFunc) NULL,
|
|
};
|
|
|
|
radio_menu_item_type = gtk_type_unique (gtk_check_menu_item_get_type (), &radio_menu_item_info);
|
|
}
|
|
|
|
return radio_menu_item_type;
|
|
}
|
|
|
|
GtkWidget*
|
|
gtk_radio_menu_item_new (GSList *group)
|
|
{
|
|
GtkRadioMenuItem *radio_menu_item;
|
|
|
|
radio_menu_item = gtk_type_new (gtk_radio_menu_item_get_type ());
|
|
|
|
gtk_radio_menu_item_set_group (radio_menu_item, group);
|
|
|
|
return GTK_WIDGET (radio_menu_item);
|
|
}
|
|
|
|
void
|
|
gtk_radio_menu_item_set_group (GtkRadioMenuItem *radio_menu_item,
|
|
GSList *group)
|
|
{
|
|
g_return_if_fail (radio_menu_item != NULL);
|
|
g_return_if_fail (GTK_IS_RADIO_MENU_ITEM (radio_menu_item));
|
|
g_return_if_fail (!g_slist_find (group, radio_menu_item));
|
|
|
|
if (radio_menu_item->group)
|
|
{
|
|
GSList *slist;
|
|
|
|
radio_menu_item->group = g_slist_remove (radio_menu_item->group, radio_menu_item);
|
|
|
|
for (slist = radio_menu_item->group; slist; slist = slist->next)
|
|
{
|
|
GtkRadioMenuItem *tmp_item;
|
|
|
|
tmp_item = slist->data;
|
|
|
|
tmp_item->group = radio_menu_item->group;
|
|
}
|
|
}
|
|
|
|
radio_menu_item->group = g_slist_prepend (group, radio_menu_item);
|
|
|
|
if (group)
|
|
{
|
|
GSList *slist;
|
|
|
|
for (slist = group; slist; slist = slist->next)
|
|
{
|
|
GtkRadioMenuItem *tmp_item;
|
|
|
|
tmp_item = slist->data;
|
|
|
|
tmp_item->group = radio_menu_item->group;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
GTK_CHECK_MENU_ITEM (radio_menu_item)->active = TRUE;
|
|
/* gtk_widget_set_state (GTK_WIDGET (radio_menu_item), GTK_STATE_ACTIVE);
|
|
*/
|
|
}
|
|
}
|
|
|
|
GtkWidget*
|
|
gtk_radio_menu_item_new_with_label (GSList *group,
|
|
const gchar *label)
|
|
{
|
|
GtkWidget *radio_menu_item;
|
|
GtkWidget *accel_label;
|
|
|
|
radio_menu_item = gtk_radio_menu_item_new (group);
|
|
accel_label = gtk_accel_label_new (label);
|
|
gtk_misc_set_alignment (GTK_MISC (accel_label), 0.0, 0.5);
|
|
gtk_container_add (GTK_CONTAINER (radio_menu_item), accel_label);
|
|
gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (accel_label), radio_menu_item);
|
|
gtk_widget_show (accel_label);
|
|
|
|
return radio_menu_item;
|
|
}
|
|
|
|
GSList*
|
|
gtk_radio_menu_item_group (GtkRadioMenuItem *radio_menu_item)
|
|
{
|
|
g_return_val_if_fail (radio_menu_item != NULL, NULL);
|
|
g_return_val_if_fail (GTK_IS_RADIO_MENU_ITEM (radio_menu_item), NULL);
|
|
|
|
return radio_menu_item->group;
|
|
}
|
|
|
|
|
|
static void
|
|
gtk_radio_menu_item_class_init (GtkRadioMenuItemClass *klass)
|
|
{
|
|
GtkMenuItemClass *menu_item_class;
|
|
GtkCheckMenuItemClass *check_menu_item_class;
|
|
|
|
menu_item_class = (GtkMenuItemClass*) klass;
|
|
check_menu_item_class = (GtkCheckMenuItemClass*) klass;
|
|
|
|
menu_item_class->activate = gtk_radio_menu_item_activate;
|
|
|
|
check_menu_item_class->draw_indicator = gtk_radio_menu_item_draw_indicator;
|
|
}
|
|
|
|
static void
|
|
gtk_radio_menu_item_init (GtkRadioMenuItem *radio_menu_item)
|
|
{
|
|
radio_menu_item->group = g_slist_prepend (NULL, radio_menu_item);
|
|
}
|
|
|
|
static void
|
|
gtk_radio_menu_item_activate (GtkMenuItem *menu_item)
|
|
{
|
|
GtkRadioMenuItem *radio_menu_item;
|
|
GtkCheckMenuItem *check_menu_item;
|
|
GtkCheckMenuItem *tmp_menu_item;
|
|
GSList *tmp_list;
|
|
gint toggled;
|
|
|
|
g_return_if_fail (menu_item != NULL);
|
|
g_return_if_fail (GTK_IS_RADIO_MENU_ITEM (menu_item));
|
|
|
|
radio_menu_item = GTK_RADIO_MENU_ITEM (menu_item);
|
|
check_menu_item = GTK_CHECK_MENU_ITEM (menu_item);
|
|
toggled = FALSE;
|
|
|
|
if (check_menu_item->active)
|
|
{
|
|
tmp_menu_item = NULL;
|
|
tmp_list = radio_menu_item->group;
|
|
|
|
while (tmp_list)
|
|
{
|
|
tmp_menu_item = tmp_list->data;
|
|
tmp_list = tmp_list->next;
|
|
|
|
if (tmp_menu_item->active && (tmp_menu_item != check_menu_item))
|
|
break;
|
|
|
|
tmp_menu_item = NULL;
|
|
}
|
|
|
|
if (tmp_menu_item)
|
|
{
|
|
toggled = TRUE;
|
|
check_menu_item->active = !check_menu_item->active;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
toggled = TRUE;
|
|
check_menu_item->active = !check_menu_item->active;
|
|
|
|
tmp_list = radio_menu_item->group;
|
|
while (tmp_list)
|
|
{
|
|
tmp_menu_item = tmp_list->data;
|
|
tmp_list = tmp_list->next;
|
|
|
|
if (tmp_menu_item->active && (tmp_menu_item != check_menu_item))
|
|
{
|
|
gtk_menu_item_activate (GTK_MENU_ITEM (tmp_menu_item));
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (toggled)
|
|
gtk_check_menu_item_toggled (check_menu_item);
|
|
gtk_widget_queue_draw (GTK_WIDGET (radio_menu_item));
|
|
}
|
|
|
|
static void
|
|
gtk_radio_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
|
|
GdkRectangle *area)
|
|
{
|
|
GtkWidget *widget;
|
|
GtkStateType state_type;
|
|
GtkShadowType shadow_type;
|
|
GdkPoint pts[4];
|
|
gint width, height;
|
|
gint x, y;
|
|
|
|
g_return_if_fail (check_menu_item != NULL);
|
|
g_return_if_fail (GTK_IS_RADIO_MENU_ITEM (check_menu_item));
|
|
|
|
if (GTK_WIDGET_DRAWABLE (check_menu_item))
|
|
{
|
|
widget = GTK_WIDGET (check_menu_item);
|
|
|
|
width = 8;
|
|
height = 8;
|
|
x = (GTK_CONTAINER (check_menu_item)->border_width +
|
|
widget->style->klass->xthickness + 2);
|
|
y = (widget->allocation.height - height) / 2;
|
|
|
|
gdk_window_clear_area (widget->window, x, y, width, height);
|
|
|
|
if (check_menu_item->active ||
|
|
check_menu_item->always_show_toggle ||
|
|
(GTK_WIDGET_STATE (check_menu_item) == GTK_STATE_PRELIGHT))
|
|
{
|
|
state_type = GTK_WIDGET_STATE (widget);
|
|
if (check_menu_item->active ||
|
|
!check_menu_item->always_show_toggle)
|
|
shadow_type = GTK_SHADOW_IN;
|
|
else
|
|
shadow_type = GTK_SHADOW_OUT;
|
|
|
|
pts[0].x = x + width / 2;
|
|
pts[0].y = y;
|
|
pts[1].x = x + width;
|
|
pts[1].y = y + height / 2;
|
|
pts[2].x = pts[0].x;
|
|
pts[2].y = y + height;
|
|
pts[3].x = x;
|
|
pts[3].y = pts[1].y;
|
|
|
|
gdk_draw_polygon (widget->window,
|
|
widget->style->bg_gc[state_type],
|
|
TRUE, pts, 4);
|
|
gtk_draw_diamond (widget->style, widget->window,
|
|
state_type, shadow_type,
|
|
x, y, width, height);
|
|
}
|
|
}
|
|
}
|
|
|