made GtkMenuItem::activate a GTK_RUN_ACTION signal.

Sat Dec 12 19:11:35 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtkmenuitem.c: made GtkMenuItem::activate a GTK_RUN_ACTION signal.

        * gtk/gtkbutton.c: made GtkButton::clicked a GTK_RUN_ACTION signal.

        * gtk/gtkfeatures.h.in: define GTK_HAVE_FEATURES_1_1_8.
This commit is contained in:
Tim Janik 1998-12-13 00:13:39 +00:00 committed by Tim Janik
parent 07f0382368
commit 6d6d3a59b8
10 changed files with 86 additions and 2 deletions

View File

@ -1,3 +1,11 @@
Sat Dec 12 19:11:35 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenuitem.c: made GtkMenuItem::activate a GTK_RUN_ACTION signal.
* gtk/gtkbutton.c: made GtkButton::clicked a GTK_RUN_ACTION signal.
* gtk/gtkfeatures.h.in: define GTK_HAVE_FEATURES_1_1_8.
Sat Dec 12 17:46:55 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtklayout.c (gtk_layout_unrealize): Mark

View File

@ -1,3 +1,11 @@
Sat Dec 12 19:11:35 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenuitem.c: made GtkMenuItem::activate a GTK_RUN_ACTION signal.
* gtk/gtkbutton.c: made GtkButton::clicked a GTK_RUN_ACTION signal.
* gtk/gtkfeatures.h.in: define GTK_HAVE_FEATURES_1_1_8.
Sat Dec 12 17:46:55 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtklayout.c (gtk_layout_unrealize): Mark

View File

@ -1,3 +1,11 @@
Sat Dec 12 19:11:35 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenuitem.c: made GtkMenuItem::activate a GTK_RUN_ACTION signal.
* gtk/gtkbutton.c: made GtkButton::clicked a GTK_RUN_ACTION signal.
* gtk/gtkfeatures.h.in: define GTK_HAVE_FEATURES_1_1_8.
Sat Dec 12 17:46:55 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtklayout.c (gtk_layout_unrealize): Mark

View File

@ -1,3 +1,11 @@
Sat Dec 12 19:11:35 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenuitem.c: made GtkMenuItem::activate a GTK_RUN_ACTION signal.
* gtk/gtkbutton.c: made GtkButton::clicked a GTK_RUN_ACTION signal.
* gtk/gtkfeatures.h.in: define GTK_HAVE_FEATURES_1_1_8.
Sat Dec 12 17:46:55 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtklayout.c (gtk_layout_unrealize): Mark

View File

@ -1,3 +1,11 @@
Sat Dec 12 19:11:35 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenuitem.c: made GtkMenuItem::activate a GTK_RUN_ACTION signal.
* gtk/gtkbutton.c: made GtkButton::clicked a GTK_RUN_ACTION signal.
* gtk/gtkfeatures.h.in: define GTK_HAVE_FEATURES_1_1_8.
Sat Dec 12 17:46:55 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtklayout.c (gtk_layout_unrealize): Mark

View File

@ -1,3 +1,11 @@
Sat Dec 12 19:11:35 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenuitem.c: made GtkMenuItem::activate a GTK_RUN_ACTION signal.
* gtk/gtkbutton.c: made GtkButton::clicked a GTK_RUN_ACTION signal.
* gtk/gtkfeatures.h.in: define GTK_HAVE_FEATURES_1_1_8.
Sat Dec 12 17:46:55 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtklayout.c (gtk_layout_unrealize): Mark

View File

@ -1,3 +1,11 @@
Sat Dec 12 19:11:35 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenuitem.c: made GtkMenuItem::activate a GTK_RUN_ACTION signal.
* gtk/gtkbutton.c: made GtkButton::clicked a GTK_RUN_ACTION signal.
* gtk/gtkfeatures.h.in: define GTK_HAVE_FEATURES_1_1_8.
Sat Dec 12 17:46:55 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtklayout.c (gtk_layout_unrealize): Mark

View File

@ -151,7 +151,7 @@ gtk_button_class_init (GtkButtonClass *klass)
GTK_TYPE_NONE, 0);
button_signals[CLICKED] =
gtk_signal_new ("clicked",
GTK_RUN_FIRST,
GTK_RUN_FIRST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkButtonClass, clicked),
gtk_marshal_NONE__NONE,
@ -306,30 +306,45 @@ gtk_button_new_with_label (const gchar *label)
void
gtk_button_pressed (GtkButton *button)
{
g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_BUTTON (button));
gtk_signal_emit (GTK_OBJECT (button), button_signals[PRESSED]);
}
void
gtk_button_released (GtkButton *button)
{
g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_BUTTON (button));
gtk_signal_emit (GTK_OBJECT (button), button_signals[RELEASED]);
}
void
gtk_button_clicked (GtkButton *button)
{
g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_BUTTON (button));
gtk_signal_emit (GTK_OBJECT (button), button_signals[CLICKED]);
}
void
gtk_button_enter (GtkButton *button)
{
g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_BUTTON (button));
gtk_signal_emit (GTK_OBJECT (button), button_signals[ENTER]);
}
void
gtk_button_leave (GtkButton *button)
{
g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_BUTTON (button));
gtk_signal_emit (GTK_OBJECT (button), button_signals[LEAVE]);
}

View File

@ -79,6 +79,10 @@ extern "C" {
*/
#define GTK_HAVE_FEATURES_1_1_7 1-1-7
/* Gtk+ 1.1.8 version tag
*/
#define GTK_HAVE_FEATURES_1_1_8 1-1-8
#ifdef __cplusplus
}
#endif /* __cplusplus */

View File

@ -113,7 +113,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
menu_item_signals[ACTIVATE] =
gtk_signal_new ("activate",
GTK_RUN_FIRST,
GTK_RUN_FIRST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkMenuItemClass, activate),
gtk_marshal_NONE__NONE,
@ -278,18 +278,27 @@ gtk_menu_item_configure (GtkMenuItem *menu_item,
void
gtk_menu_item_select (GtkMenuItem *menu_item)
{
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
gtk_item_select (GTK_ITEM (menu_item));
}
void
gtk_menu_item_deselect (GtkMenuItem *menu_item)
{
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
gtk_item_deselect (GTK_ITEM (menu_item));
}
void
gtk_menu_item_activate (GtkMenuItem *menu_item)
{
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
gtk_signal_emit (GTK_OBJECT (menu_item), menu_item_signals[ACTIVATE]);
}