diff options
Diffstat (limited to 'x11/gtkmm/patches/patch-ab')
-rw-r--r-- | x11/gtkmm/patches/patch-ab | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/x11/gtkmm/patches/patch-ab b/x11/gtkmm/patches/patch-ab new file mode 100644 index 00000000000..433ef3440d6 --- /dev/null +++ b/x11/gtkmm/patches/patch-ab @@ -0,0 +1,42 @@ +$NetBSD: patch-ab,v 1.7 2007/09/22 22:56:43 wiz Exp $ + +--- gtk/src/toolbar.hg.orig 2007-05-04 07:31:27.000000000 +0000 ++++ gtk/src/toolbar.hg +@@ -74,7 +74,11 @@ public: + + _WRAP_METHOD(void unset_toolbar_style(), gtk_toolbar_unset_style) + +- //Note that gtk_toolbar_set_icon_size() is deprecated, but gtk_toolbar_get_icon_size() is not. ++ //Note that gtk_toolbar_set_icon_size() and gtk_toolbar_unset_icon_size() were ++ //deprecated sometime before GTK+ 2.4, but were undeprecated in GTK+ 2.12. ++ _WRAP_METHOD(void set_icon_size(IconSize icon_size), gtk_toolbar_set_icon_size) ++ _WRAP_METHOD(void unset_icon_size(), gtk_toolbar_unset_icon_size) ++ + _WRAP_METHOD(IconSize get_icon_size() const, gtk_toolbar_get_icon_size) + + _WRAP_METHOD(ReliefStyle get_relief_style() const, gtk_toolbar_get_relief_style) +@@ -113,9 +117,11 @@ public: + _IGNORE_SIGNAL("move_focus") + _IGNORE_SIGNAL("focus_home_or_end") + +- //This is called get_tooltips_object() to avoid a clash with get_tooltips(), which just says whether they are enabled. +- +- _MEMBER_GET(tooltips_object, tooltips, Tooltips*, GtkTooltips*) ++ #ifndef GTKMM_DISABLE_DEPRECATED ++ //This was called get_tooltips_object() to avoid a clash with get_tooltips(), which just says whether they are enabled. ++ ///@deprecated Use the Gtk::Tooltip API instead. ++ Tooltips* get_tooltips_object() const; ++ #endif //GTKMM_DISABLE_DEPRECATED + + //This is probably the same as Container::children().size(), which is deprecated anyway? + //_MEMBER_GET(num_children, num_children, int, gint) +@@ -132,8 +138,7 @@ public: + //Ignore deprecated GtkToolbarAPI: + //Normally we just deprecate it in gtkmm too, + //but the GtkToolbar compatibility system is particularly unpleasant, so we just removed it in gtkmm 2.4. murrayc. +- _IGNORE(gtk_toolbar_set_icon_size, gtk_toolbar_unset_icon_size, +- gtk_toolbar_append_item, gtk_toolbar_prepend_item, gtk_toolbar_insert_item, gtk_toolbar_insert_stock ++ _IGNORE(gtk_toolbar_append_item, gtk_toolbar_prepend_item, gtk_toolbar_insert_item, gtk_toolbar_insert_stock + gtk_toolbar_append_space, gtk_toolbar_prepend_space, gtk_toolbar_insert_space, gtk_toolbar_remove_space + gtk_toolbar_append_element, gtk_toolbar_prepend_element, gtk_toolbar_insert_element, + gtk_toolbar_append_widget, gtk_toolbar_prepend_widget, gtk_toolbar_insert_widget) |