From e89c191f5525d3b5767f3e9e8eb1476d19f27835 Mon Sep 17 00:00:00 2001
From: Jakob Leben <jakob.leben@gmail.com>
Date: Sat, 8 Oct 2011 06:20:11 +0200
Subject: [PATCH] qt gui: fix QScrollView instantiation

---
 SCClassLibrary/QtCollider/BasicViews.sc | 6 +++++-
 SCClassLibrary/QtCollider/QWindow.sc    | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/SCClassLibrary/QtCollider/BasicViews.sc b/SCClassLibrary/QtCollider/BasicViews.sc
index 9195ef345..d10051cfe 100644
--- a/SCClassLibrary/QtCollider/BasicViews.sc
+++ b/SCClassLibrary/QtCollider/BasicViews.sc
@@ -125,6 +125,10 @@ QVLayoutView : QView {
   *qtClass { ^"QcVLayoutWidget" }
 }
 
+QScrollCanvas : QObject {
+  *qtClass { ^'QcScrollWidget' }
+}
+
 QScrollView : QAbstractScroll {
   var <canvas;
   var <background, <hasBorder=true;
@@ -169,7 +173,7 @@ QScrollView : QAbstractScroll {
   initQScrollView {
     // NOTE: The canvas widget must not be a QView, so that asking its
     // children for parent will skip it and hit this view instead.
-    this.canvas = QObject("QcScrollWidget");
+    this.canvas = QScrollCanvas();
   }
 }
 
diff --git a/SCClassLibrary/QtCollider/QWindow.sc b/SCClassLibrary/QtCollider/QWindow.sc
index 6f714e986..52b7f7e7d 100644
--- a/SCClassLibrary/QtCollider/QWindow.sc
+++ b/SCClassLibrary/QtCollider/QWindow.sc
@@ -1,6 +1,5 @@
-QTopScrollWidget : QObject {
+QTopScrollWidget : QScrollCanvas {
   var <>win;
-  *qtClass { ^'QcScrollWidget' }
   doDrawFunc { win.drawFunc.value(win); }
 }
 
-- 
2.11.4.GIT