[gtkmm/dboles/fix-compilation: 3/3] Popover: GTK no longer exports interface for Model



commit c6c7a7e1a29d354f51147ba1144b09517832d482
Author: Daniel Boles <dboles src gnome org>
Date:   Sat Jun 15 21:21:57 2019 +0100

    Popover: GTK no longer exports interface for Model
    
    Presumably we need to do that in Gtk::PopoverMenu now, but this commit
    is only here so that we can at least continue compiling in the meantime.

 gtk/src/popover.ccg | 16 ----------------
 gtk/src/popover.hg  | 43 -------------------------------------------
 2 files changed, 59 deletions(-)
---
diff --git a/gtk/src/popover.ccg b/gtk/src/popover.ccg
index e169fb44..093cdb5a 100644
--- a/gtk/src/popover.ccg
+++ b/gtk/src/popover.ccg
@@ -22,20 +22,4 @@ using Constraint = Gtk::Popover::Constraint;
 
 namespace Gtk
 {
-
-Popover::Popover(const Widget& relative_to, const Glib::RefPtr<Gio::MenuModel>& model)
-:
-  _CONSTRUCT("relative_to", relative_to.gobj())
-{
-  bind_model(model);
-}
-
-Popover::Popover(const Glib::RefPtr<Gio::MenuModel>& model)
-:
-  _CONSTRUCT("relative_to", 0)
-{
-  bind_model(model);
-}
-
 } // namespace Gtk
-
diff --git a/gtk/src/popover.hg b/gtk/src/popover.hg
index 59e0597a..4c211080 100644
--- a/gtk/src/popover.hg
+++ b/gtk/src/popover.hg
@@ -18,7 +18,6 @@
 
 #include <gtkmm/bin.h>
 #include <gtkmm/native.h>
-#include <giomm/menumodel.h>
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/bin_p.h)
@@ -61,46 +60,6 @@ public:
    */
   _WRAP_CTOR(Popover(const Widget& relative_to{?}), gtk_popover_new)
 
-  //This is custom-implemented because the gtk_popover_new_from_model() does more
-  //than just call g_object_new. MenuBar and Menu have both the same issue.
-  //See https://bugzilla.gnome.org/show_bug.cgi?id=704671
-  /** Creates a Popover and populates it according to
-   * @a model. The popover is pointed to the @a relative_to widget.
-   *
-   * The created buttons are connected to actions found in the
-   * ApplicationWindow to which the popover belongs - typically
-   * by means of being attached to a widget that is contained within
-   * the ApplicationWindow widget hierarchy.
-   *
-   * Actions can also be added using Widget::insert_action_group()
-   * on the menu's attached widget or on any of its parent widgets.
-   *
-   * @param relative_to: Widget the popover is related to
-   * @param model: a Gio::MenuModel
-   *
-   * @newin{3,12}
-   */
-  explicit Popover(const Widget& relative_to, const Glib::RefPtr<Gio::MenuModel>& model);
-
-  /** Creates a Popover and populates it according to
-   * @a model.
-   *
-   * The created buttons are connected to actions found in the
-   * ApplicationWindow to which the popover belongs - typically
-   * by means of being attached to a widget that is contained within
-   * the ApplicationWindow widget hierarchy.
-   *
-   * Actions can also be added using Widget::insert_action_group()
-   * on the menu's attached widget or on any of its parent widgets.
-   *
-   * @param model: a Gio::MenuModel
-   *
-   * @newin{3,12}
-   */
-  explicit Popover(const Glib::RefPtr<Gio::MenuModel>& model);
-
-  _IGNORE(gtk_popover_new_from_model)
-
 
   _WRAP_METHOD(void set_relative_to(const Widget& relative_to), gtk_popover_set_relative_to)
   // transfer none
@@ -122,8 +81,6 @@ public:
   _WRAP_METHOD(void set_has_arrow(bool has_arrow = true), gtk_popover_set_has_arrow)
   _WRAP_METHOD(bool get_has_arrow() const, gtk_popover_get_has_arrow)
 
-  _WRAP_METHOD(void bind_model(const Glib::RefPtr<Gio::MenuModel>& model, const Glib::ustring& 
action_namespace{?}), gtk_popover_bind_model)
-
   _WRAP_METHOD(void set_default_widget(Widget& widget), gtk_popover_set_default_widget)
 
   _WRAP_METHOD(void popup(), gtk_popover_popup)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]