Fix @tig branch errors.

UICatalog/Scenarios/CharacterMap.cs

@@ -491,7 +491,7 @@ internal class CharMap : View
                                vScrollBar.Size = GetContentSize ().Height;
                                vScrollBar.Position = Viewport.Y;
                            };
-    };
+    }
 
     private void Handle_MouseEvent (object sender, MouseEventEventArgs e)
     {

UICatalog/Scenarios/ScrollBarDemo.cs

@@ -183,7 +183,7 @@ public class ScrollBarDemo : Scenario
                                         };
 
         var ckbAutoHideScrollBar = new CheckBox { Y = Pos.Bottom (scrollPosition), Text = "AutoHideScrollBar" };
-        ckbAutoHideScrollBar.CheckedStateChanging += (s, e) => scrollBar.AutoHideScrollBar = e.NewValue == CheckState.Checked;
+        ckbAutoHideScrollBar.CheckedStateChanging += (s, e) => scrollBar.AutoHide = e.NewValue == CheckState.Checked;
         view.Add (ckbAutoHideScrollBar);
 
         var ckbShowScrollIndicator = new CheckBox { X = Pos.Right (ckbAutoHideScrollBar) + 1, Y = Pos.Bottom (scrollPosition), Text = "ShowScrollIndicator" };

UnitTests/Views/ScrollBarTests.cs

@@ -32,7 +32,7 @@ public class ScrollBarTests
         Assert.True (scrollBar.ShowScrollIndicator);
         Assert.True (scrollBar.Visible);
 
-        scrollBar.AutoHideScrollBar = false;
+        scrollBar.AutoHide = false;
         Assert.True (scrollBar.ShowScrollIndicator);
         Assert.True (scrollBar.Visible);
 
@@ -228,7 +228,7 @@ public class ScrollBarTests
         Assert.Equal ("Auto(Content,Absolute(1),)", scrollBar.Width!.ToString ());
         Assert.Equal ("Auto(Content,Absolute(1),)", scrollBar.Height!.ToString ());
         Assert.True (scrollBar.ShowScrollIndicator);
-        Assert.True (scrollBar.AutoHideScrollBar);
+        Assert.True (scrollBar.AutoHide);
     }
 
     [Theory]
@@ -989,11 +989,11 @@ public class ScrollBarTests
         Assert.True (scrollBar.Visible);
 
         scrollBar.ShowScrollIndicator = false;
-        Assert.True (scrollBar.AutoHideScrollBar);
+        Assert.True (scrollBar.AutoHide);
         Assert.True (scrollBar.ShowScrollIndicator);
         Assert.True (scrollBar.Visible);
 
-        scrollBar.AutoHideScrollBar = false;
+        scrollBar.AutoHide = false;
         Assert.False (scrollBar.ShowScrollIndicator);
         Assert.False (scrollBar.Visible);