[gtkmm] Gtk::PlacesSidebar, TextView: Update signal_populate_popup()



commit c3f6d6e2c1e15c864512c988e8c295b4f9afbafa
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Tue Jan 10 13:30:28 2017 +0100

    Gtk::PlacesSidebar, TextView: Update signal_populate_popup()
    
    Change Menu* to Container* in signal_populate_popup(). In gtk+ it's a
    GtkWidget*, but the documentation says that it's a container.

 gtk/src/placessidebar.hg |    5 +----
 gtk/src/textview.hg      |    8 ++------
 2 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/gtk/src/placessidebar.hg b/gtk/src/placessidebar.hg
index aca0165..1b59c00 100644
--- a/gtk/src/placessidebar.hg
+++ b/gtk/src/placessidebar.hg
@@ -131,10 +131,8 @@ public:
   _WRAP_SIGNAL(int drag_action_ask(int actions), "drag_action_ask", no_default_handler)
   _WRAP_SIGNAL(void open_location(const Glib::RefPtr<Gio::File>& location, PlacesOpenFlags open_flags), 
"open_location", no_default_handler)
 
-  //TODO: From gtk+ 3.18 the first parameter in populate_popup does not have to be a GtkMenu*.
-  //When be can break ABI, change to Container* container. Also change in gtk_signals.defs.patch.
 #m4 _CONVERSION(`GVolume*',`const Glib::RefPtr<Gio::Volume>&', `Glib::wrap($3, true)')
-  _WRAP_SIGNAL(void populate_popup(Menu* menu, const Glib::RefPtr<Gio::File>& selected_item, const 
Glib::RefPtr<Gio::Volume>& selected_volume), "populate_popup", no_default_handler)
+  _WRAP_SIGNAL(void populate_popup(Container* container, const Glib::RefPtr<Gio::File>& selected_item, const 
Glib::RefPtr<Gio::Volume>& selected_volume), "populate_popup", no_default_handler)
 
   _WRAP_SIGNAL(void show_error_message(const Glib::ustring& primary, const Glib::ustring& secondary), 
"show_error_message", no_default_handler)
   _WRAP_SIGNAL(void show_enter_location(), "show_enter_location", no_default_handler)
@@ -156,4 +154,3 @@ public:
 };
 
 } // namespace Gtk
-
diff --git a/gtk/src/textview.hg b/gtk/src/textview.hg
index 6b17b5e..7e0ec8a 100644
--- a/gtk/src/textview.hg
+++ b/gtk/src/textview.hg
@@ -203,12 +203,8 @@ public:
   _WRAP_METHOD(void set_monospace(bool monospace = true), gtk_text_view_set_monospace)
   _WRAP_METHOD(bool get_monospace() const, gtk_text_view_get_monospace)
 
-  //TODO: This signal now takes a GtkWidget* instead of just a GtkMenu*,
-  //so change that when we can break ABI.
-  //See https://git.gnome.org/browse/gtk+/commit/?id=88623b98a7ca0afca08ac21bc3aa662c6ed3ab7f
-#m4 _CONVERSION(`Menu*',`GtkWidget*',`GTK_WIDGET(($3)->gobj())')
-  _WRAP_SIGNAL(void populate_popup(Menu* menu), "populate_popup")
-
+#m4 _CONVERSION(`Container*',`GtkWidget*',`($3)->Widget::gobj()')
+  _WRAP_SIGNAL(void populate_popup(Container* popup), "populate_popup")
   _WRAP_SIGNAL(void set_anchor(), "set_anchor")
 
 #m4 _CONVERSION(`const char*',`const Glib::ustring&',__GCHARP_TO_USTRING)


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