[gtkmm/wip/dboles/builder-nicer-4: 8/11] Builder: Add returning vers of get_widget|_derived

[Daniel Boles <dboles src gnome org>]

commit d2638e379cab4c983208ebb02e2e97caca9e4db3
Author: Daniel Boles <dboles src gnome org>
Date:   Mon Dec 17 01:48:52 2018 +0000

    Builder: Add returning vers of get_widget|_derived
    
    To avoid the cumbersome two-step process of declaring a pointer and then
    passing it to get_widget[_derived]() for use as an output argument, add
    overloads that return the pointer directly. Of course, now we have no
    arg from which to deduce the type, so pass that as a template argument.
    
    https://gitlab.gnome.org/GNOME/gtkmm/issues/43

 gtk/src/builder.hg | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
---
diff --git a/gtk/src/builder.hg b/gtk/src/builder.hg
index bb400bab..09c4707c 100644
--- a/gtk/src/builder.hg
+++ b/gtk/src/builder.hg
@@ -481,6 +481,37 @@ public:
     const_cast<Builder*>(this)->get_widget(name, widget);
   }
 
+  /** Gets a widget from the Builder file.
+   *
+   * For instance:
+   * @code
+   * auto pGrid = refBuilder->get_widget<Gtk::Grid>("mygrid");
+   * @endcode
+   *
+   * See get_widget().
+   *
+   * @param name The name of the widget.
+   * @return A pointer to the widget, or <tt>nullptr</tt> on failure.
+   *
+   * @newin{3,94}
+   */
+  template <class T_Widget> inline
+  T_Widget* get_widget(const Glib::ustring& name)
+  {
+    T_Widget* widget;
+    get_widget(name, widget);
+    return widget;
+  }
+
+  /** See the non-const version.
+   * @newin{3,94}
+   */
+  template <class T_Widget> inline
+  const T_Widget* get_widget(const Glib::ustring& name) const
+  {
+    return const_cast<Builder*>(this)->get_widget<const T_Widget>(name);
+  }
+
   /** Gets a widget whose details are specified in the GtkBuilder file,
    * but which is implemented by your own derived class.
    *
@@ -564,6 +595,41 @@ public:
     get_widget_derived(std::const_pointer_cast<Gtk::Builder>(builder), name, widget, 
std::forward<Args>(args)...);
   }
 
+  /** Gets a widget whose details are specified in the GtkBuilder file,
+   * but which is implemented by your own derived class.
+   *
+   * For instance:
+   * @code
+   * auto pDialog1 = Gtk::Builder::get_widget_derived<MyDerivedDialog>(refBuilder, "mydialog1");
+   * auto pDialog2 = Gtk::Builder::get_widget_derived<MyDerivedDialog>(refBuilder, "mydialog2", "A storm is 
imminent!", true);
+   * @endcode
+   *
+   * See get_widget_derived().
+   *
+   * @param builder The Gtk::Builder from which to get the widget.
+   * @param name The name of the widget.
+   * @param args Additional arguments to pass to the constructor of the derived class.
+   * @return widget A pointer to the widget, or <tt>nullptr</tt> on failure.
+   *
+   * @newin{3,94}
+   */
+  template <typename T_Widget, typename... Args> inline
+  static T_Widget* get_widget_derived(const Glib::RefPtr<Gtk::Builder>& builder, const Glib::ustring& name, 
Args&&... args)
+  {
+    T_Widget* widget;
+    get_widget_derived(builder, name, widget, std::forward<Args>(args)...);
+    return widget;
+  }
+
+  /** See the non-const version.
+   * @newin{3,94}
+   */
+  template <typename T_Widget, typename... Args> inline
+  static const T_Widget* get_widget_derived(const Glib::RefPtr<const Gtk::Builder>& builder, const 
Glib::ustring& name, Args&&... args)
+  {
+    return get_widget_derived<const T_Widget>(std::const_pointer_cast<Gtk::Builder>(builder), name, 
std::forward<Args>(args)...);
+  }
+
 #m4 _CONVERSION(`GSList*',`std::vector<Glib::RefPtr<Glib::Object> 
> ',`Glib::SListHandler<Glib::RefPtr<Glib::Object> >::slist_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
   _WRAP_METHOD(std::vector<Glib::RefPtr<Glib::Object> > get_objects(), gtk_builder_get_objects)