GNOME.org
 

[gtk+] Remove GtkItem

commit 3bd93e5bfd968d21cbcba15b952b254c41f204f9
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Sep 8 23:35:17 2010 -0400

     Remove GtkItem
    
    With the demise of GtkList and GtkTree, it has GtkMenuItem as sole
    derived class, and is not really adding any value as a separate class.
    Its few useful features have been merged into GtkMenuItem.
    
    Bug 629104

 docs/reference/gtk/gtk-docs.sgml     |    1 -
 docs/reference/gtk/gtk3-sections.txt |   18 ----
 docs/reference/gtk/tmpl/gtkitem.sgml |   75 --------------
 gtk/Makefile.am                      |    2 -
 gtk/gtk.h                            |    1 -
 gtk/gtk.symbols                      |    9 --
 gtk/gtkitem.c                        |  179 ----------------------------------
 gtk/gtkitem.h                        |   79 ---------------
 gtk/gtkmenuitem.c                    |   81 +++++++++++-----
 gtk/gtkmenuitem.h                    |   12 ++-
 gtk/gtkmenushell.c                   |    2 +-
 11 files changed, 64 insertions(+), 395 deletions(-)
---
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 34c1aa1..d1f2288 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -369,7 +369,6 @@ that is, GUI components such as #GtkButton or #GtkTextView.
       <title>Abstract Base Classes</title>
       <xi:include href="xml/gtkbin.xml" />
       <xi:include href="xml/gtkcontainer.xml" />
-      <xi:include href="xml/gtkitem.xml" />
       <xi:include href="xml/gtkmenushell.xml" />
       <xi:include href="xml/gtkmisc.xml" />
       <xi:include href="xml/gtkobject.xml" />
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index 900c096..9d9fb2d 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -1833,24 +1833,6 @@ gtk_invisible_get_type
 </SECTION>
 
 <SECTION>
-<FILE>gtkitem</FILE>
-<TITLE>GtkItem</TITLE>
-GtkItem
-gtk_item_select
-gtk_item_deselect
-gtk_item_toggle
-<SUBSECTION Standard>
-GTK_ITEM
-GTK_IS_ITEM
-GTK_TYPE_ITEM
-GTK_ITEM_CLASS
-GTK_IS_ITEM_CLASS
-GTK_ITEM_GET_CLASS
-<SUBSECTION Private>
-gtk_item_get_type
-</SECTION>
-
-<SECTION>
 <FILE>gtklabel</FILE>
 <TITLE>GtkLabel</TITLE>
 GtkLabel
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 398dd3d..adb1712 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -230,7 +230,6 @@ gtk_public_h_sources =          \
 	gtkimmulticontext.h	\
 	gtkinfobar.h		\
 	gtkinvisible.h		\
-	gtkitem.h		\
 	gtklabel.h		\
 	gtklayout.h             \
 	gtklinkbutton.h		\
@@ -497,7 +496,6 @@ gtk_base_c_sources =            \
 	gtkimmulticontext.c	\
 	gtkinfobar.c		\
 	gtkinvisible.c		\
-	gtkitem.c		\
 	gtkkeyhash.c		\
 	gtklabel.c		\
 	gtklayout.c		\
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 48f1c29..71a0fa5 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -113,7 +113,6 @@
 #include <gtk/gtkimmulticontext.h>
 #include <gtk/gtkinfobar.h>
 #include <gtk/gtkinvisible.h>
-#include <gtk/gtkitem.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtklayout.h>
 #include <gtk/gtklinkbutton.h>
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 5e5b9ab..36ef632 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -1732,15 +1732,6 @@ gtk_invisible_set_screen
 #endif
 #endif
 
-#if IN_HEADER(__GTK_ITEM_H__)
-#if IN_FILE(__GTK_ITEM_C__)
-gtk_item_deselect
-gtk_item_get_type G_GNUC_CONST
-gtk_item_select
-gtk_item_toggle
-#endif
-#endif
-
 #if IN_HEADER(__GTK_LABEL_H__)
 #if IN_FILE(__GTK_LABEL_C__)
 gtk_label_get_angle
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 0203083..733c965 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -51,6 +51,8 @@ enum {
   ACTIVATE_ITEM,
   TOGGLE_SIZE_REQUEST,
   TOGGLE_SIZE_ALLOCATE,
+  SELECT,
+  DESELECT,
   LAST_SIGNAL
 };
 
@@ -84,6 +86,10 @@ static void gtk_menu_item_realize        (GtkWidget        *widget);
 static void gtk_menu_item_unrealize      (GtkWidget        *widget);
 static void gtk_menu_item_map            (GtkWidget        *widget);
 static void gtk_menu_item_unmap          (GtkWidget        *widget);
+static gboolean gtk_menu_item_enter      (GtkWidget        *widget,
+                                          GdkEventCrossing *event);
+static gboolean gtk_menu_item_leave      (GtkWidget        *widget,
+                                          GdkEventCrossing *event);
 static void gtk_menu_item_paint          (GtkWidget        *widget,
 					  GdkRectangle     *area);
 static gint gtk_menu_item_expose         (GtkWidget        *widget,
@@ -92,8 +98,8 @@ static void gtk_menu_item_parent_set     (GtkWidget        *widget,
 					  GtkWidget        *previous_parent);
 
 
-static void gtk_real_menu_item_select               (GtkItem     *item);
-static void gtk_real_menu_item_deselect             (GtkItem     *item);
+static void gtk_real_menu_item_select               (GtkMenuItem *item);
+static void gtk_real_menu_item_deselect             (GtkMenuItem *item);
 static void gtk_real_menu_item_activate             (GtkMenuItem *item);
 static void gtk_real_menu_item_activate_item        (GtkMenuItem *item);
 static void gtk_real_menu_item_toggle_size_request  (GtkMenuItem *menu_item,
@@ -162,7 +168,7 @@ static guint menu_item_signals[LAST_SIGNAL] = { 0 };
 
 static GtkBuildableIface *parent_buildable_iface;
 
-G_DEFINE_TYPE_WITH_CODE (GtkMenuItem, gtk_menu_item, GTK_TYPE_ITEM,
+G_DEFINE_TYPE_WITH_CODE (GtkMenuItem, gtk_menu_item, GTK_TYPE_BIN,
 			 G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
 						gtk_menu_item_buildable_interface_init)
 			 G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTIVATABLE,
@@ -180,7 +186,6 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
   GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
   GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
-  GtkItemClass *item_class = GTK_ITEM_CLASS (klass);
 
   gobject_class->dispose      = gtk_menu_item_dispose;
   gobject_class->set_property = gtk_menu_item_set_property;
@@ -194,6 +199,8 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
   widget_class->unrealize = gtk_menu_item_unrealize;
   widget_class->map = gtk_menu_item_map;
   widget_class->unmap = gtk_menu_item_unmap;
+  widget_class->enter_notify_event = gtk_menu_item_enter;
+  widget_class->leave_notify_event = gtk_menu_item_leave;
   widget_class->show_all = gtk_menu_item_show_all;
   widget_class->hide_all = gtk_menu_item_hide_all;
   widget_class->mnemonic_activate = gtk_menu_item_mnemonic_activate;
@@ -202,15 +209,14 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
   
   container_class->forall = gtk_menu_item_forall;
 
-  item_class->select      = gtk_real_menu_item_select;
-  item_class->deselect    = gtk_real_menu_item_deselect;
-
   klass->activate             = gtk_real_menu_item_activate;
   klass->activate_item        = gtk_real_menu_item_activate_item;
   klass->toggle_size_request  = gtk_real_menu_item_toggle_size_request;
   klass->toggle_size_allocate = gtk_real_menu_item_toggle_size_allocate;
   klass->set_label            = gtk_real_menu_item_set_label;
   klass->get_label            = gtk_real_menu_item_get_label;
+  klass->select               = gtk_real_menu_item_select;
+  klass->deselect             = gtk_real_menu_item_deselect;
 
   klass->hide_on_activate = TRUE;
 
@@ -253,6 +259,24 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
 		  G_TYPE_NONE, 1,
 		  G_TYPE_INT);
 
+  menu_item_signals[SELECT] =
+    g_signal_new (I_("select"),
+                  G_OBJECT_CLASS_TYPE (gobject_class),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GtkMenuItemClass, select),
+                  NULL, NULL,
+                  _gtk_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
+  menu_item_signals[DESELECT] =
+    g_signal_new (I_("deselect"),
+                  G_OBJECT_CLASS_TYPE (gobject_class),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (GtkMenuItemClass, deselect),
+                  NULL, NULL,
+                  _gtk_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+
   /**
    * GtkMenuItem:right-justified:
    *
@@ -955,8 +979,6 @@ gtk_menu_item_get_height_for_width (GtkSizeRequest      *request,
     *natural_size = nat_height;
 }
 
-
-
 static void
 gtk_menu_item_buildable_interface_init (GtkBuildableIface *iface)
 {
@@ -965,7 +987,7 @@ gtk_menu_item_buildable_interface_init (GtkBuildableIface *iface)
   iface->custom_finished = gtk_menu_item_buildable_custom_finished;
 }
 
-static void 
+static void
 gtk_menu_item_buildable_add_child (GtkBuildable *buildable,
 				   GtkBuilder   *builder,
 				   GObject      *child,
@@ -1230,7 +1252,7 @@ gtk_menu_item_select (GtkMenuItem *menu_item)
 
   g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
 
-  gtk_item_select (GTK_ITEM (menu_item));
+  g_signal_emit (menu_item, menu_item_signals[SELECT], 0);
 
   /* Enable themeing of the parent menu item depending on whether
    * something is selected in its submenu
@@ -1252,7 +1274,7 @@ gtk_menu_item_deselect (GtkMenuItem *menu_item)
 
   g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
 
-  gtk_item_deselect (GTK_ITEM (menu_item));
+  g_signal_emit (menu_item, menu_item_signals[DESELECT], 0);
 
   /* Enable themeing of the parent menu item depending on whether
    * something is selected in its submenu
@@ -1466,6 +1488,24 @@ gtk_menu_item_unmap (GtkWidget *widget)
   GTK_WIDGET_CLASS (gtk_menu_item_parent_class)->unmap (widget);
 }
 
+static gboolean
+gtk_menu_item_enter (GtkWidget        *widget,
+                     GdkEventCrossing *event)
+{
+  g_return_val_if_fail (event != NULL, FALSE);
+
+  return gtk_widget_event (gtk_widget_get_parent (widget), (GdkEvent *) event);
+}
+
+static gboolean
+gtk_menu_item_leave (GtkWidget        *widget,
+                     GdkEventCrossing *event)
+{
+  g_return_val_if_fail (event != NULL, FALSE);
+
+  return gtk_widget_event (gtk_widget_get_parent (widget), (GdkEvent*) event);
+}
+
 static void
 gtk_menu_item_paint (GtkWidget    *widget,
 		     GdkRectangle *area)
@@ -1598,16 +1638,11 @@ gtk_menu_item_expose (GtkWidget      *widget,
 }
 
 static void
-gtk_real_menu_item_select (GtkItem *item)
+gtk_real_menu_item_select (GtkMenuItem *menu_item)
 {
-  GtkMenuItem *menu_item;
   gboolean touchscreen_mode;
 
-  g_return_if_fail (GTK_IS_MENU_ITEM (item));
-
-  menu_item = GTK_MENU_ITEM (item);
-
-  g_object_get (gtk_widget_get_settings (GTK_WIDGET (item)),
+  g_object_get (gtk_widget_get_settings (GTK_WIDGET (menu_item)),
                 "gtk-touchscreen-mode", &touchscreen_mode,
                 NULL);
 
@@ -1624,14 +1659,8 @@ gtk_real_menu_item_select (GtkItem *item)
 }
 
 static void
-gtk_real_menu_item_deselect (GtkItem *item)
+gtk_real_menu_item_deselect (GtkMenuItem *menu_item)
 {
-  GtkMenuItem *menu_item;
-
-  g_return_if_fail (GTK_IS_MENU_ITEM (item));
-
-  menu_item = GTK_MENU_ITEM (item);
-
   if (menu_item->submenu)
     _gtk_menu_item_popdown_submenu (GTK_WIDGET (menu_item));
 
diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h
index 6334785..cadccc0 100644
--- a/gtk/gtkmenuitem.h
+++ b/gtk/gtkmenuitem.h
@@ -31,8 +31,7 @@
 #ifndef __GTK_MENU_ITEM_H__
 #define __GTK_MENU_ITEM_H__
 
-
-#include <gtk/gtkitem.h>
+#include <gtk/gtkbin.h>
 
 
 G_BEGIN_DECLS
@@ -50,7 +49,7 @@ typedef struct _GtkMenuItemClass  GtkMenuItemClass;
 
 struct _GtkMenuItem
 {
-  GtkItem item;
+  GtkBin bin;
 
   GtkWidget *GSEAL (submenu);
   GdkWindow *GSEAL (event_window);
@@ -70,7 +69,7 @@ struct _GtkMenuItem
 
 struct _GtkMenuItemClass
 {
-  GtkItemClass parent_class;
+  GtkBinClass parent_class;
   
   /* If the following flag is true, then we should always hide
    * the menu when the MenuItem is activated. Otherwise, the 
@@ -90,9 +89,14 @@ struct _GtkMenuItemClass
 				 const gchar *label);
   G_CONST_RETURN gchar *(* get_label) (GtkMenuItem *menu_item);
 
+  void (* select)               (GtkMenuItem *menu_item);
+  void (* deselect)             (GtkMenuItem *menu_item);
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 42542c8..9aee0f1 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -1079,7 +1079,7 @@ gtk_menu_shell_remove (GtkContainer *container,
   
   if (widget == menu_shell->active_menu_item)
     {
-      gtk_item_deselect (GTK_ITEM (menu_shell->active_menu_item));
+      g_signal_emit_by_name (menu_shell->active_menu_item, "deselect");
       menu_shell->active_menu_item = NULL;
     }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]