[gtkmm] Inherit Activatable, and some build fixes.

[David King <davidk src gnome org>]

commit fa633b44e26bfa5e38d9c782049d31c3812f88e3
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Apr 30 16:44:17 2009 +0200

    Inherit Activatable, and some build fixes.
    
    * gtk/src/button.hg:
    * gtk/src/menuitem.hg:
    * gtk/src/recentchoosermenu.hg:
    * gtk/src/toolbutton.hg:
    * gtk/src/toolitem.hg: Inherit and Implement Activatable.
    
    * gtk/src/iconview.hg:
    * gtk/src/treeviewcolumn.hg:
    * gtk/src/entrycompletion.hg: Correct the _IMPLEMENTS_INTERFACE() spelling to
    fix the build.
    * gtk/src/separator.hg: Include orientable.h to fix the build.

 ChangeLog                    |   16 ++++++++++++++++
 gtk/src/button.hg            |    8 +++++---
 gtk/src/entrycompletion.hg   |    2 +-
 gtk/src/iconview.hg          |    2 +-
 gtk/src/menuitem.hg          |    8 +++++---
 gtk/src/recentchoosermenu.hg |    7 ++++---
 gtk/src/separator.hg         |    4 ++--
 gtk/src/toolbutton.hg        |    2 --
 gtk/src/toolitem.hg          |    8 ++++++--
 gtk/src/treeviewcolumn.hg    |    2 +-
 10 files changed, 41 insertions(+), 18 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3359664..19f88d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2009-04-30  Murray Cumming  <murrayc murrayc com>
+
+	Inherit Activatable, and some build fixes.
+	
+	* gtk/src/button.hg:
+	* gtk/src/menuitem.hg:
+	* gtk/src/recentchoosermenu.hg:
+	* gtk/src/toolbutton.hg:
+	* gtk/src/toolitem.hg: Inherit and Implement Activatable.
+	
+	* gtk/src/iconview.hg:
+	* gtk/src/treeviewcolumn.hg:
+	* gtk/src/entrycompletion.hg: Correct the _IMPLEMENTS_INTERFACE() spelling to 
+		fix the build.
+	* gtk/src/separator.hg: Include orientable.h to fix the build.
+
 2009-04-28  Murray Cumming  <murrayc murrayc com>
 
 	Fixed build, plus some const changes.
diff --git a/gtk/src/button.hg b/gtk/src/button.hg
index 3958b6e..9a49464 100644
--- a/gtk/src/button.hg
+++ b/gtk/src/button.hg
@@ -26,6 +26,7 @@
 #m4 _POP()
 
 #include <gtkmm/bin.h>
+#include <gtkmm/activatable.h>
 #include <gtkmm/stockid.h>
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/bin_p.h)
@@ -36,8 +37,6 @@ namespace Gtk
 
 namespace Stock { struct BuiltinStockID; }
 
-// TODO: Inherit/Implement Activatable when we can break ABI.
-
 /** A widget that creates a signal when clicked on.
  *
  * This widget is generally used with a signal handler that is called when the button is pressed.
@@ -48,9 +47,12 @@ namespace Stock { struct BuiltinStockID; }
  *
  * @ingroup Widgets
  */
-class Button : public Bin
+class Button
+  : public Bin,
+    public Activatable
 {
   _CLASS_GTKOBJECT(Button,GtkButton,GTK_BUTTON,Gtk::Bin,GtkBin)
+  _IMPLEMENTS_INTERFACE(Activatable)
 public:
 
   /** Create an empty button.
diff --git a/gtk/src/entrycompletion.hg b/gtk/src/entrycompletion.hg
index 6107958..3b463b3 100644
--- a/gtk/src/entrycompletion.hg
+++ b/gtk/src/entrycompletion.hg
@@ -63,7 +63,7 @@ class EntryCompletion
    public Gtk::CellLayout
 {
   _CLASS_GOBJECT(EntryCompletion, GtkEntryCompletion, GTK_ENTRY_COMPLETION, Glib::Object, GObject)
-  _IMPLEMENT_INTERFACE(CellLayout)
+  _IMPLEMENTS_INTERFACE(CellLayout)
 
 protected:
   _CTOR_DEFAULT()
diff --git a/gtk/src/iconview.hg b/gtk/src/iconview.hg
index af9cf28..d2772e1 100644
--- a/gtk/src/iconview.hg
+++ b/gtk/src/iconview.hg
@@ -49,7 +49,7 @@ class IconView
    public CellLayout
 {
   _CLASS_GTKOBJECT(IconView, GtkIconView, GTK_ICON_VIEW, Gtk::Container, GtkContainer)
-  _IMPLEMENT_INTERFACE(CellLayout)
+  _IMPLEMENTS_INTERFACE(CellLayout)
 public:
 
   _CTOR_DEFAULT()
diff --git a/gtk/src/menuitem.hg b/gtk/src/menuitem.hg
index 6667b94..1fce66f 100644
--- a/gtk/src/menuitem.hg
+++ b/gtk/src/menuitem.hg
@@ -24,6 +24,7 @@ _CONFIGINCLUDE(gtkmmconfig.h)
 #include <gtkmm/item.h>
 #include <gtkmm/accelkey.h>
 #include <gtkmm/accellabel.h>
+#include <gtkmm/activatable.h>
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/item_p.h)
 
@@ -33,17 +34,18 @@ namespace Gtk
 class Menu;
 namespace Menu_Helpers { class Element; }
 
-// TODO: Inherit/Implement Activatable when we can break ABI.
-
 /** Child item for menus.
  * Handle highlighting, alignment, events and submenus.
  * As it derives from Gtk::Bin it can hold any valid child widget, altough only a few are really useful.
  * @ingroup Widgets
  * @ingroup Menus
  */
-class MenuItem : public Item
+class MenuItem
+ : public Item,
+   public Activatable
 {
   _CLASS_GTKOBJECT(MenuItem,GtkMenuItem,GTK_MENU_ITEM,Gtk::Item,GtkItem)
+  _IMPLEMENTS_INTERFACE(Activatable)
 public:
   /// Create an empty menu item
   _CTOR_DEFAULT
diff --git a/gtk/src/recentchoosermenu.hg b/gtk/src/recentchoosermenu.hg
index 3f59bfa..cfe09b5 100644
--- a/gtk/src/recentchoosermenu.hg
+++ b/gtk/src/recentchoosermenu.hg
@@ -19,6 +19,7 @@
 
 #include <gtkmm/menu.h>
 #include <gtkmm/recentchooser.h>
+#include <gtkmm/activatable.h>
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/menu_p.h)
@@ -26,8 +27,6 @@ _PINCLUDE(gtkmm/private/menu_p.h)
 namespace Gtk
 {
 
-// TODO: Inherit/Implement Activatable when we can break ABI.
-
 /** RecentChooserMenu is a widget suitable for displaying recently used files
  * inside a menu.  It can be used to set a sub-menu of a MenuItem using
  * MenuItem::item_set_submenu(), or as the menu of a MenuToolButton.
@@ -41,10 +40,12 @@ namespace Gtk
  */
 class RecentChooserMenu
   : public Menu,
-    public RecentChooser
+    public RecentChooser,
+    public Activatable
 {
   _CLASS_GTKOBJECT(RecentChooserMenu, GtkRecentChooserMenu, GTK_RECENT_CHOOSER_MENU, Gtk::Menu, GtkMenu)
   _IMPLEMENTS_INTERFACE(RecentChooser)
+  _IMPLEMENTS_INTERFACE(Activatable)
 public:
   _CTOR_DEFAULT;
 
diff --git a/gtk/src/separator.hg b/gtk/src/separator.hg
index aa20e2e..41a6514 100644
--- a/gtk/src/separator.hg
+++ b/gtk/src/separator.hg
@@ -20,8 +20,8 @@
  */
 
 #include <gtkmm/widget.h>
-_DEFS(gtkmm,gtk)
-_DEFS(gtkmm,gtk)
+#include <gtkmm/orientable.h>
+
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/widget_p.h)
 
diff --git a/gtk/src/toolbutton.hg b/gtk/src/toolbutton.hg
index ec56e9c..d6bf693 100644
--- a/gtk/src/toolbutton.hg
+++ b/gtk/src/toolbutton.hg
@@ -23,8 +23,6 @@ _PINCLUDE(gtkmm/private/toolitem_p.h)
 namespace Gtk
 {
 
-// TODO: Inherit/Implement Activatable when we can break ABI.
-
 /** A Gtk::ToolItem subclass that displays buttons.
  *
  * A ToolButton is are Gtk::ToolItem containing a button.
diff --git a/gtk/src/toolitem.hg b/gtk/src/toolitem.hg
index 29efb43..2ccccd8 100644
--- a/gtk/src/toolitem.hg
+++ b/gtk/src/toolitem.hg
@@ -25,7 +25,8 @@ _CONFIGINCLUDE(gtkmmconfig.h)
 
 #include <gtkmm/bin.h>
 #include <gtkmm/tooltips.h>
-#include <gtkmm/sizegroup.h>
+#include <gtkmm/activatable.h>
+
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/bin_p.h)
 
@@ -35,9 +36,12 @@ namespace Gtk
 /**
  * @ingroup Widgets
  */
-class ToolItem : public Bin
+class ToolItem
+ : public Bin,
+   public Activatable
 {
   _CLASS_GTKOBJECT(ToolItem, GtkToolItem, GTK_TOOL_ITEM, Gtk::Bin, GtkBin)
+  _IMPLEMENTS_INTERFACE(Activatable)
 public:
   _CTOR_DEFAULT
 
diff --git a/gtk/src/treeviewcolumn.hg b/gtk/src/treeviewcolumn.hg
index f96339d..51ed442 100644
--- a/gtk/src/treeviewcolumn.hg
+++ b/gtk/src/treeviewcolumn.hg
@@ -55,7 +55,7 @@ class GTKMM_API TreeViewColumn
     public CellLayout
 {
   _CLASS_GTKOBJECT(TreeViewColumn, GtkTreeViewColumn, GTK_TREE_VIEW_COLUMN, Gtk::Object, GtkObject)
-  _IMPLEMENT_INTERFACE(CellLayout)
+  _IMPLEMENTS_INTERFACE(CellLayout)
   _IGNORE(gtk_tree_view_column_set_cell_data_func)
 public:
   typedef TreeViewColumn Column;