From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Fri, 22 May 2020 16:31:46 +0000 (+0200)
Subject: gtk+-3.0: Deprecated abstract methods are not required to be implemented
X-Git-Tag: 0.49.1~124
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=481ca637c571bd9fa88a7d79f1a8e9debd018bc9;p=thirdparty%2Fvala.git

gtk+-3.0: Deprecated abstract methods are not required to be implemented
---

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 7350bbedf..8d794ddfe 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -1567,7 +1567,7 @@ namespace Gtk {
 		[Version (since = "2.18")]
 		public bool get_sensitive ();
 		[Version (deprecated = true, deprecated_since = "3.0", replacement = "get_preferred_size")]
-		public abstract void get_size (Gtk.Widget widget, Gdk.Rectangle? cell_area, out int x_offset, out int y_offset, out int width, out int height);
+		public virtual void get_size (Gtk.Widget widget, Gdk.Rectangle? cell_area, out int x_offset, out int y_offset, out int width, out int height);
 		[Version (since = "3.0")]
 		public Gtk.StateFlags get_state (Gtk.Widget? widget, Gtk.CellRendererState cell_state);
 		[Version (since = "2.18")]
@@ -10760,9 +10760,9 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_style_provider_get_type ()")]
 	public interface StyleProvider : GLib.Object {
 		[Version (deprecated = true, deprecated_since = "3.8", since = "3.0")]
-		public abstract unowned Gtk.IconFactory? get_icon_factory (Gtk.WidgetPath path);
+		public virtual unowned Gtk.IconFactory? get_icon_factory (Gtk.WidgetPath path);
 		[Version (deprecated = true, deprecated_since = "3.8", since = "3.0")]
-		public abstract Gtk.StyleProperties? get_style (Gtk.WidgetPath path);
+		public virtual Gtk.StyleProperties? get_style (Gtk.WidgetPath path);
 		[Version (since = "3.0")]
 		public abstract bool get_style_property (Gtk.WidgetPath path, Gtk.StateFlags state, GLib.ParamSpec pspec, ref GLib.Value value);
 	}
diff --git a/vapi/metadata/Gtk-3.0.metadata b/vapi/metadata/Gtk-3.0.metadata
index 392922596..95bb0d8e6 100644
--- a/vapi/metadata/Gtk-3.0.metadata
+++ b/vapi/metadata/Gtk-3.0.metadata
@@ -242,8 +242,10 @@ TreeModel
 
 // Abstract vs. virtual
 CellRenderer
-  .get_size#virtual_method abstract
   .render#virtual_method abstract
+StyleProvider
+  .get_icon_factory#virtual_method virtual
+  .get_style#virtual_method virtual
 TreeModel
   .iter_previous#virtual_method virtual
   .ref_node#virtual_method virtual