--- a/stx_goodies_libcairo.st	Thu Feb 25 20:55:41 2016 +0000
+++ b/stx_goodies_libcairo.st	Sun Feb 28 14:53:56 2016 +0000
@@ -32,6 +32,7 @@
     ^ #(
         #'stx:libbasic'    "ArrayedCollection - superclass of Cairo::CStructure"
         #'stx:libview'    "DeviceGraphicsContext - extended"
+        #'stx:libview2'    "stx_libview2 - extended"
     )
 !
 
@@ -94,7 +95,6 @@
     ^ #(
         #'stx:goodies/sunit'    "TestAsserter - superclass of Cairo::Examples1"
         #'stx:libcomp'    "SyntaxHighlighter - referenced by Cairo::AbstractViewer>>postBuildWorkspace:"
-        #'stx:libview2'    "ApplicationModel - superclass of Cairo::AbstractViewer"
         #'stx:libwidg'    "HVScrollableView - referenced by Image>>inspector2TabImageCairo"
     )
 !
@@ -200,7 +200,6 @@
         SimpleView redrawWithCairoBufferedX:y:width:height:
         SimpleView redrawWithCairoX:y:width:height:
         DeviceGraphicsContext cairo
-        Image bitsARGB32Into:stride:fg:bg:
         Image inspector2TabImageCairo
         GraphicsContext displayDeviceLineFromX:y:toX:y:
         GraphicsContext displayDeviceRectangleX:y:width:height:
@@ -209,6 +208,8 @@
         GraphicsMedium cairoify
         SimpleView cairoify
         SimpleView cairoSurface
+        'stx_libbasic class' #'version_HG'
+        'stx_libview2 class' #'version_HG'
     )
 ! !