[hyena/gtk3: 9/9] Merge branch 'master' into gtk3

[Bertrand Lorentz <blorentz src gnome org>]

commit 6ae1a8a8762a07a7af22c51984370ea4eb9e5c20
Merge: 5efb54b 2273ff3
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date:   Sat Nov 12 19:10:10 2011 +0100

    Merge branch 'master' into gtk3
    
    Conflicts:
    	Hyena.Gui/Hyena.Data.Gui/ListView/ListView.cs
    	Hyena.Gui/Hyena.Widgets/RoundedFrame.cs

 .../Accessibility/ListViewAccessible.cs            |    4 +++
 Hyena.Gui/Hyena.Data.Gui/ListView/ListView.cs      |    3 ++
 .../ListView/ListView_Interaction.cs               |    4 +++
 .../Hyena.Data.Gui/ListView/ListView_Rendering.cs  |    1 +
 Hyena.Gui/Hyena.Gui/BaseWidgetAccessible.cs        |    4 +++
 Hyena.Gui/Hyena.Widgets/AnimatedImage.cs           |    4 +++
 Hyena.Gui/Hyena.Widgets/MessageBar.cs              |    4 +++
 Hyena.Gui/Hyena.Widgets/RatingEntry.cs             |    4 +++
 Hyena.Gui/Hyena.Widgets/RoundedFrame.cs            |   25 +++++++++++++------
 Hyena/Hyena/SafeUri.cs                             |   12 +++++++++
 10 files changed, 57 insertions(+), 8 deletions(-)
---
diff --cc Hyena.Gui/Hyena.Data.Gui/ListView/ListView.cs
index 08db88e,e5142a1..b783297
--- a/Hyena.Gui/Hyena.Data.Gui/ListView/ListView.cs
+++ b/Hyena.Gui/Hyena.Data.Gui/ListView/ListView.cs
@@@ -47,7 -49,7 +49,8 @@@ namespace Hyena.Data.Gu
              HasTooltip = true;
              QueryTooltip += OnQueryTooltip;
              DirectionChanged += (o, a) => SetDirection ();
+             manager = new CanvasManager (this);
 +            OnStyleUpdated ();
          }
  
          private void OnQueryTooltip (object o, Gtk.QueryTooltipArgs args)
diff --cc Hyena.Gui/Hyena.Widgets/RoundedFrame.cs
index 0025cc2,2c9a8f1..d8fe215
--- a/Hyena.Gui/Hyena.Widgets/RoundedFrame.cs
+++ b/Hyena.Gui/Hyena.Widgets/RoundedFrame.cs
@@@ -86,50 -96,19 +96,49 @@@ namespace Hyena.Widget
              set { draw_border = value; QueueDraw (); }
          }
  
 +        public Gtk.ScrollablePolicy HscrollPolicy {
 +            get; set;
 +        }
 +
 +        public Gtk.ScrollablePolicy VscrollPolicy {
 +            get; set;
 +        }
 +
 +        public Gtk.Adjustment Vadjustment {
 +            get; set;
 +        }
 +
 +        public Gtk.Adjustment Hadjustment {
 +            get; set;
 +        }
 +
  #region Gtk.Widget Overrides
  
 -        protected override void OnStyleSet (Style previous_style)
 +        protected override void OnStyleUpdated ()
          {
 -            base.OnStyleSet (previous_style);
 +            base.OnStyleUpdated ();
-             theme = Hyena.Gui.Theming.ThemeEngine.CreateTheme (this);
-             frame_width = (int)theme.Context.Radius + 1;
+             InitTheme ();
          }
  
 -        protected override void OnSizeRequested (ref Requisition requisition)
 +        protected override void OnGetPreferredHeight (out int minimum_height, out int natural_height)
 +        {
 +            var requisition = SizeRequested ();
 +            minimum_height = natural_height = requisition.Height;
 +        }
 +
 +        protected override void OnGetPreferredWidth (out int minimum_width, out int natural_width)
          {
 +            var requisition = SizeRequested ();
 +            minimum_width = natural_width = requisition.Width;
 +        }
 +
 +        protected Requisition SizeRequested ()
 +        {
 +            var requisition = new Requisition ();
              if (child != null && child.Visible) {
                  // Add the child's width/height
 -                Requisition child_requisition = child.SizeRequest ();
 +                Requisition child_requisition, nat_requisition;
 +                child.GetPreferredSize (out child_requisition, out nat_requisition);
                  requisition.Width = Math.Max (0, child_requisition.Width);
                  requisition.Height = child_requisition.Height;
              } else {