Merge branch 'adapt-upstream-changes'

1 files changed, 0 insertions, 42 deletions

diff --git a/core/src/widget/scrollable.vala b/core/src/widget/scrollable.vala
deleted file mode 100644
index 1a0e081..0000000
--- a/core/src/widget/scrollable.vala
+++ /dev/null
@@ -1,42 +0,0 @@
-namespace Astal {
-public class Scrollable : Gtk.ScrolledWindow {
-    private Gtk.PolicyType _hscroll = Gtk.PolicyType.AUTOMATIC;
-    private Gtk.PolicyType _vscroll = Gtk.PolicyType.AUTOMATIC;
-
-    public Gtk.PolicyType hscroll {
-        get { return _hscroll; }
-        set {
-            _hscroll = value;
-            set_policy(value, vscroll);
-        }
-    }
-
-    public Gtk.PolicyType vscroll {
-        get { return _vscroll; }
-        set {
-            _vscroll = value;
-            set_policy(hscroll, value);
-        }
-    }
-
-    static construct {
-        set_css_name("scrollable");
-    }
-
-    construct {
-        if (hadjustment != null)
-            hadjustment = new Gtk.Adjustment(0,0,0,0,0,0);
-
-        if (vadjustment != null)
-            vadjustment = new Gtk.Adjustment(0,0,0,0,0,0);
-    }
-
-    public new Gtk.Widget get_child() {
-        var ch = base.get_child();
-        if (ch is Gtk.Viewport) {
-            return ch.get_child();
-        }
-        return ch;
-    }
-}
-}