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.

diff --git a/ChangeLog b/ChangeLog
index 0a5638aaa985b2ad16e0f0afb290d6f5b92f0d32..a66b6d7b504d378df1ae36676eecd26f1e8b5807 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0a5638aaa985b2ad16e0f0afb290d6f5b92f0d32..a66b6d7b504d378df1ae36676eecd26f1e8b5807 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -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

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0a5638aaa985b2ad16e0f0afb290d6f5b92f0d32..a66b6d7b504d378df1ae36676eecd26f1e8b5807 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0a5638aaa985b2ad16e0f0afb290d6f5b92f0d32..a66b6d7b504d378df1ae36676eecd26f1e8b5807 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -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

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0a5638aaa985b2ad16e0f0afb290d6f5b92f0d32..a66b6d7b504d378df1ae36676eecd26f1e8b5807 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0a5638aaa985b2ad16e0f0afb290d6f5b92f0d32..a66b6d7b504d378df1ae36676eecd26f1e8b5807 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0a5638aaa985b2ad16e0f0afb290d6f5b92f0d32..a66b6d7b504d378df1ae36676eecd26f1e8b5807 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index fcc6cca46a8792e1a6c0f7c27a2170acc40fb44d..69da1044ac304866fb38d080c9fecf9bf5ada7e3 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -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]);
 }
 

diff --git a/gtk/gtkfeatures.h.in b/gtk/gtkfeatures.h.in
index 632bec90d36cf81e752525395a74b4074c039c09..f1d56e9b5edc4a8e500549ba716ad5ae78f4d96f 100644 (file)
--- a/gtk/gtkfeatures.h.in
+++ b/gtk/gtkfeatures.h.in
@@ -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 */

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index cec8e3f14763d1fe8770778aea35146c96d61c96..1b9765c9dd8ff7ad1309123991561c007ef8da21 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -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]);
 }