Commit 6d6d3a59 authored by Tim Janik's avatar Tim Janik Committed by Tim Janik

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.
parent 07f03823
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> Sat Dec 12 17:46:55 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtklayout.c (gtk_layout_unrealize): Mark * gtk/gtklayout.c (gtk_layout_unrealize): Mark
......
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> Sat Dec 12 17:46:55 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtklayout.c (gtk_layout_unrealize): Mark * gtk/gtklayout.c (gtk_layout_unrealize): Mark
......
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> Sat Dec 12 17:46:55 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtklayout.c (gtk_layout_unrealize): Mark * gtk/gtklayout.c (gtk_layout_unrealize): Mark
......
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> Sat Dec 12 17:46:55 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtklayout.c (gtk_layout_unrealize): Mark * gtk/gtklayout.c (gtk_layout_unrealize): Mark
......
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> Sat Dec 12 17:46:55 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtklayout.c (gtk_layout_unrealize): Mark * gtk/gtklayout.c (gtk_layout_unrealize): Mark
......
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> Sat Dec 12 17:46:55 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtklayout.c (gtk_layout_unrealize): Mark * gtk/gtklayout.c (gtk_layout_unrealize): Mark
......
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> Sat Dec 12 17:46:55 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtklayout.c (gtk_layout_unrealize): Mark * gtk/gtklayout.c (gtk_layout_unrealize): Mark
......
...@@ -151,7 +151,7 @@ gtk_button_class_init (GtkButtonClass *klass) ...@@ -151,7 +151,7 @@ gtk_button_class_init (GtkButtonClass *klass)
GTK_TYPE_NONE, 0); GTK_TYPE_NONE, 0);
button_signals[CLICKED] = button_signals[CLICKED] =
gtk_signal_new ("clicked", gtk_signal_new ("clicked",
GTK_RUN_FIRST, GTK_RUN_FIRST | GTK_RUN_ACTION,
object_class->type, object_class->type,
GTK_SIGNAL_OFFSET (GtkButtonClass, clicked), GTK_SIGNAL_OFFSET (GtkButtonClass, clicked),
gtk_marshal_NONE__NONE, gtk_marshal_NONE__NONE,
...@@ -306,30 +306,45 @@ gtk_button_new_with_label (const gchar *label) ...@@ -306,30 +306,45 @@ gtk_button_new_with_label (const gchar *label)
void void
gtk_button_pressed (GtkButton *button) 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]); gtk_signal_emit (GTK_OBJECT (button), button_signals[PRESSED]);
} }
void void
gtk_button_released (GtkButton *button) 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]); gtk_signal_emit (GTK_OBJECT (button), button_signals[RELEASED]);
} }
void void
gtk_button_clicked (GtkButton *button) 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]); gtk_signal_emit (GTK_OBJECT (button), button_signals[CLICKED]);
} }
void void
gtk_button_enter (GtkButton *button) 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]); gtk_signal_emit (GTK_OBJECT (button), button_signals[ENTER]);
} }
void void
gtk_button_leave (GtkButton *button) 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]); gtk_signal_emit (GTK_OBJECT (button), button_signals[LEAVE]);
} }
......
...@@ -79,6 +79,10 @@ extern "C" { ...@@ -79,6 +79,10 @@ extern "C" {
*/ */
#define GTK_HAVE_FEATURES_1_1_7 1-1-7 #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 #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
......
...@@ -113,7 +113,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass) ...@@ -113,7 +113,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
menu_item_signals[ACTIVATE] = menu_item_signals[ACTIVATE] =
gtk_signal_new ("activate", gtk_signal_new ("activate",
GTK_RUN_FIRST, GTK_RUN_FIRST | GTK_RUN_ACTION,
object_class->type, object_class->type,
GTK_SIGNAL_OFFSET (GtkMenuItemClass, activate), GTK_SIGNAL_OFFSET (GtkMenuItemClass, activate),
gtk_marshal_NONE__NONE, gtk_marshal_NONE__NONE,
...@@ -278,18 +278,27 @@ gtk_menu_item_configure (GtkMenuItem *menu_item, ...@@ -278,18 +278,27 @@ gtk_menu_item_configure (GtkMenuItem *menu_item,
void void
gtk_menu_item_select (GtkMenuItem *menu_item) 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)); gtk_item_select (GTK_ITEM (menu_item));
} }
void void
gtk_menu_item_deselect (GtkMenuItem *menu_item) 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)); gtk_item_deselect (GTK_ITEM (menu_item));
} }
void void
gtk_menu_item_activate (GtkMenuItem *menu_item) 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]); gtk_signal_emit (GTK_OBJECT (menu_item), menu_item_signals[ACTIVATE]);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment