[gtkmm] Remove Item because it was removed from GTK+.

[Murray Cumming <murrayc src gnome org>]

commit d76670fcd1ce33e74bb9a07285065de38b929edd
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Sep 9 22:04:08 2010 +0200

    Remove Item because it was removed from GTK+.
    
    * gtk/src/item.[hg|ccg]: Remove.
    * gtk/src/filelist.am: Remove mention of item.hg.
    * gtk/gtkmm.h: Remove mention of item.h.
    * gtk/src/menuitem.[hg|ccg]: Derive from Bin instead of Item, as now in
    GTK+.

 ChangeLog                                 |   10 +++++
 gtk/gtkmm.h                               |    1 -
 gtk/src/filelist.am                       |    1 -
 gtk/src/item.ccg                          |   25 -------------
 gtk/src/item.hg                           |   57 -----------------------------
 gtk/src/menuitem.ccg                      |    2 +-
 gtk/src/menuitem.hg                       |    8 ++--
 tools/extra_defs_gen/generate_defs_gtk.cc |    1 -
 8 files changed, 15 insertions(+), 90 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 95e8431..238744e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-09  Murray Cumming  <murrayc murrayc com>
+
+	Remove Item because it was removed from GTK+.
+
+	* gtk/src/item.[hg|ccg]: Remove.
+	* gtk/src/filelist.am: Remove mention of item.hg.
+	* gtk/gtkmm.h: Remove mention of item.h.
+	* gtk/src/menuitem.[hg|ccg]: Derive from Bin instead of Item, as now in 
+	GTK+.
+
 2010-09-06  Murray Cumming  <murrayc murrayc com>
 
 	RadioAction: Added join_group().
diff --git a/gtk/gtkmm.h b/gtk/gtkmm.h
index acb7b0c..cfc8943 100644
--- a/gtk/gtkmm.h
+++ b/gtk/gtkmm.h
@@ -150,7 +150,6 @@ extern const int gtkmm_micro_version;
 #include <gtkmm/image.h>
 #include <gtkmm/imagemenuitem.h>
 #include <gtkmm/infobar.h>
-#include <gtkmm/item.h>
 #include <gtkmm/calendar.h>
 #include <gtkmm/invisible.h>
 #include <gtkmm/label.h>
diff --git a/gtk/src/filelist.am b/gtk/src/filelist.am
index 38f08f8..2d4b08c 100644
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@ -83,7 +83,6 @@ gtkmm_files_any_hg =		\
 	imagemenuitem.hg	\
 	infobar.hg		\
 	invisible.hg		\
-	item.hg			\
 	label.hg		\
 	layout.hg		\
 	linkbutton.hg		\
diff --git a/gtk/src/menuitem.ccg b/gtk/src/menuitem.ccg
index 930fa7b..0e8a030 100644
--- a/gtk/src/menuitem.ccg
+++ b/gtk/src/menuitem.ccg
@@ -90,7 +90,7 @@ void MenuItem::accelerate(Window& window)
                           accel_key_.get_key(),
                           accel_key_.get_mod());
 
-      Item::set_accel_path(accel_key_.get_path(), window.get_accel_group());
+      Bin::set_accel_path(accel_key_.get_path(), window.get_accel_group());
     }
   }
 
diff --git a/gtk/src/menuitem.hg b/gtk/src/menuitem.hg
index a2cc1e8..115ddb7 100644
--- a/gtk/src/menuitem.hg
+++ b/gtk/src/menuitem.hg
@@ -18,12 +18,12 @@
 
 _CONFIGINCLUDE(gtkmmconfig.h)
 
-#include <gtkmm/item.h>
+#include <gtkmm/bin.h>
 #include <gtkmm/accelkey.h>
 #include <gtkmm/accellabel.h>
 #include <gtkmm/activatable.h>
 _DEFS(gtkmm,gtk)
-_PINCLUDE(gtkmm/private/item_p.h)
+_PINCLUDE(gtkmm/private/bin_p.h)
 
 namespace Gtk
 {
@@ -38,10 +38,10 @@ namespace Menu_Helpers { class Element; }
  * @ingroup Menus
  */
 class MenuItem
- : public Item,
+ : public Bin,
    public Activatable
 {
-  _CLASS_GTKOBJECT(MenuItem,GtkMenuItem,GTK_MENU_ITEM,Gtk::Item,GtkItem)
+  _CLASS_GTKOBJECT(MenuItem,GtkMenuItem,GTK_MENU_ITEM,Gtk::Bin,GtkBin)
   _IMPLEMENTS_INTERFACE(Activatable)
 public:
   /// Create an empty menu item
diff --git a/tools/extra_defs_gen/generate_defs_gtk.cc b/tools/extra_defs_gen/generate_defs_gtk.cc
index 8c83dcd..0c1d93d 100644
--- a/tools/extra_defs_gen/generate_defs_gtk.cc
+++ b/tools/extra_defs_gen/generate_defs_gtk.cc
@@ -111,7 +111,6 @@ int main(int argc, char** argv)
             << get_defs( GTK_TYPE_IMAGE_MENU_ITEM )
             << get_defs( GTK_TYPE_INFO_BAR )
             << get_defs( GTK_TYPE_INVISIBLE )
-            << get_defs( GTK_TYPE_ITEM )
             << get_defs( GTK_TYPE_ICON_VIEW )
             << get_defs( GTK_TYPE_LABEL )
             << get_defs( GTK_TYPE_LAYOUT )