[gtkmm] Gtk::Container: Make add() non-virtual

[Kjell Ahlstedt <kjellahl src gnome org>]

commit 8f182629b2c6f2e025fb8338f6a36c350d88edbf
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Sun Nov 13 15:52:22 2016 +0100

    Gtk::Container: Make add() non-virtual
    
    * gtk/src/container.hg: Remove the virtual keyword from add().
    * gtk/src/scrolledwindow.[hg|ccg]:
    * gtk/src/stack.[hg|ccg]: Remove the add() methods that override
    Container::add().

 gtk/src/container.hg       |    5 +----
 gtk/src/scrolledwindow.ccg |    8 --------
 gtk/src/scrolledwindow.hg  |    3 ---
 gtk/src/stack.ccg          |    5 -----
 gtk/src/stack.hg           |   13 -------------
 5 files changed, 1 insertions(+), 33 deletions(-)
---
diff --git a/gtk/src/container.hg b/gtk/src/container.hg
index 177e077..d5458dd 100644
--- a/gtk/src/container.hg
+++ b/gtk/src/container.hg
@@ -60,11 +60,8 @@ public:
 
 /* Application-level methods */
 
-  //This is virtual so that we can override it in Gtk::ScrolledWindow.
-  //TODO: Remove the virtual keyword when we can break ABI,
-  //because the override in ScrolledWindow is no longer necessary.
   _WRAP_METHOD_DOCS_ONLY(gtk_container_add)
-  virtual void add(Widget& widget);
+  void add(Widget& widget);
   _IGNORE(gtk_container_add)
 
   /** Removes @a widget from the container.
diff --git a/gtk/src/scrolledwindow.ccg b/gtk/src/scrolledwindow.ccg
index f1f05ef..1e7ba54 100644
--- a/gtk/src/scrolledwindow.ccg
+++ b/gtk/src/scrolledwindow.ccg
@@ -23,12 +23,4 @@
 namespace Gtk
 {
 
-void ScrolledWindow::add(Gtk::Widget& widget)
-{
-  //TODO: Remove this method overload completely when we can break ABI.
-  //We used to do what GTK+ now does for us:
-  //See https://bugzilla.gnome.org/show_bug.cgi?id=693015
-  Bin::add(widget);
-}
-
 } //namespace Gtk
diff --git a/gtk/src/scrolledwindow.hg b/gtk/src/scrolledwindow.hg
index 6b79135..3c756fc 100644
--- a/gtk/src/scrolledwindow.hg
+++ b/gtk/src/scrolledwindow.hg
@@ -73,9 +73,6 @@ public:
   _WRAP_METHOD(void set_shadow_type(ShadowType type), gtk_scrolled_window_set_shadow_type)
   _WRAP_METHOD(ShadowType get_shadow_type() const, gtk_scrolled_window_get_shadow_type)
 
-  ///Puts the child inside a Gtk::Viewport if it doesn't have native scrolling capability.
-  void add(Gtk::Widget& widget) override;
-
 #m4 _CONVERSION(`GtkWidget*',`Scrollbar*',`Glib::wrap((GtkScrollbar*)$3)')
 #m4 _CONVERSION(`GtkWidget*',`const Scrollbar*',`Glib::wrap((GtkScrollbar*)$3)')
   _WRAP_METHOD(Scrollbar* get_vscrollbar(), gtk_scrolled_window_get_vscrollbar)
diff --git a/gtk/src/stack.ccg b/gtk/src/stack.ccg
index 89373fb..acb379f 100644
--- a/gtk/src/stack.ccg
+++ b/gtk/src/stack.ccg
@@ -21,9 +21,4 @@
 namespace Gtk
 {
 
-void Stack::add(Widget& child)
-{
-  Container::add(child);
-}
-
 } //namespace Gtk
diff --git a/gtk/src/stack.hg b/gtk/src/stack.hg
index 21e2e25..31fc2f9 100644
--- a/gtk/src/stack.hg
+++ b/gtk/src/stack.hg
@@ -44,21 +44,8 @@ public:
   _CTOR_DEFAULT
 
   _WRAP_METHOD(void add(Widget& child, const Glib::ustring& name), gtk_stack_add_named)
-
   _WRAP_METHOD(void add(Widget& child, const Glib::ustring& name, const Glib::ustring& title), 
gtk_stack_add_titled)
 
-  //TODO: Remove this method overload when we can break ABI and API, and Container::add()
-  //has been made non-virtual. It's not very useful in Stack. It's needed only to
-  //avoid a compilation error when compiling with -Woverloaded-virtual -Werror.
-  //See https://bugzilla.gnome.org/show_bug.cgi?id=724732
-  /** Adds a child.
-   *
-   * @newin{3,14}
-   *
-   * @deprecated Use one of the other add() methods instead. This method was added only to avoid a 
compilation error.
-   */
-  void add(Widget& child) override;
-
   _WRAP_METHOD(void set_visible_child(Widget& child), gtk_stack_set_visible_child)
 
   _WRAP_METHOD(Widget* get_visible_child(), gtk_stack_get_visible_child)