[hyena/gtk3: 7/13] Fix all cosmetic from previous commits

[Gabriel Burt <gburt src gnome org>]

commit 991ab59205bdc06f39defee6a122a21f8db4cdd8
Author: Olivier Dufour <olivier duff gmail com>
Date:   Fri Apr 22 19:08:19 2011 +0200

    Fix all cosmetic from previous commits

 Hyena.Gui/Hyena.Data.Gui/ColumnCellCheckBox.cs |    6 +++---
 Hyena.Gui/Hyena.Gui/BaseWidgetAccessible.cs    |    2 +-
 Hyena.Gui/Hyena.Widgets/AnimatedBox.cs         |    4 +++-
 Hyena.Gui/Hyena.Widgets/AnimatedWidget.cs      |    3 ++-
 Hyena.Gui/Hyena.Widgets/ComplexMenuItem.cs     |   11 ++++++-----
 5 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/Hyena.Gui/Hyena.Data.Gui/ColumnCellCheckBox.cs b/Hyena.Gui/Hyena.Data.Gui/ColumnCellCheckBox.cs
index c3e1837..373b3cf 100644
--- a/Hyena.Gui/Hyena.Data.Gui/ColumnCellCheckBox.cs
+++ b/Hyena.Gui/Hyena.Data.Gui/ColumnCellCheckBox.cs
@@ -58,9 +58,9 @@ namespace Hyena.Data.Gui
             if (context.State == StateType.Normal && last_hover_bound == BoundObjectParent) {
                 context.State = StateType.Prelight;
             }
-			context.Widget.StyleContext.State = (Value ? StateFlags.Active : StateFlags.Normal);
-			//"cellcheck"
-			Gtk.Render.Check (context.Widget.StyleContext, context.Context, x, y, Size, Size);
+            context.Widget.StyleContext.State = (Value ? StateFlags.Active : StateFlags.Normal);
+            //"cellcheck"
+            Gtk.Render.Check (context.Widget.StyleContext, context.Context, x, y, Size, Size);
         }
 
         private object last_pressed_bound;
diff --git a/Hyena.Gui/Hyena.Gui/BaseWidgetAccessible.cs b/Hyena.Gui/Hyena.Gui/BaseWidgetAccessible.cs
index eda1eab..28afb90 100644
--- a/Hyena.Gui/Hyena.Gui/BaseWidgetAccessible.cs
+++ b/Hyena.Gui/Hyena.Gui/BaseWidgetAccessible.cs
@@ -232,7 +232,7 @@ namespace Hyena.Gui
 
             #pragma warning disable 0612
             //widget.SetUposition (x, y);
-			widget.SetAllocation (new Gdk.Rectangle (x, y, w, h));
+            widget.SetAllocation (new Gdk.Rectangle (x, y, w, h));
             #pragma warning restore 0612
 
             if (setSize) {
diff --git a/Hyena.Gui/Hyena.Widgets/AnimatedBox.cs b/Hyena.Gui/Hyena.Widgets/AnimatedBox.cs
index 2ac20a7..959cba1 100644
--- a/Hyena.Gui/Hyena.Widgets/AnimatedBox.cs
+++ b/Hyena.Gui/Hyena.Widgets/AnimatedBox.cs
@@ -210,7 +210,9 @@ namespace Hyena.Widgets
             }
 
             foreach (AnimatedWidget widget in Widgets) {
-                Requisition req = widget.SizeRequest ();
+                Requisition req, nat;
+                widget.GetPreferredSize (req, nat);
+
                 if (horizontal) {
                     width += req.Width;
                     height = Math.Max (height, req.Height);
diff --git a/Hyena.Gui/Hyena.Widgets/AnimatedWidget.cs b/Hyena.Gui/Hyena.Widgets/AnimatedWidget.cs
index 8b628c7..dd3661e 100644
--- a/Hyena.Gui/Hyena.Widgets/AnimatedWidget.cs
+++ b/Hyena.Gui/Hyena.Widgets/AnimatedWidget.cs
@@ -146,7 +146,8 @@ namespace Hyena.Widgets
         {
             var requisition = new Requisition ();
             if (Widget != null) {
-                Requisition req = Widget.SizeRequest ();
+                Requisition req, nat;
+                Widget.GetPreferredSize (req, nat);
                 widget_alloc.Width = req.Width;
                 widget_alloc.Height = req.Height;
             }
diff --git a/Hyena.Gui/Hyena.Widgets/ComplexMenuItem.cs b/Hyena.Gui/Hyena.Widgets/ComplexMenuItem.cs
index b961f0b..d662b62 100644
--- a/Hyena.Gui/Hyena.Widgets/ComplexMenuItem.cs
+++ b/Hyena.Gui/Hyena.Widgets/ComplexMenuItem.cs
@@ -82,8 +82,9 @@ namespace Hyena.Widgets
                 height = Allocation.Height;
 
                 ShadowType shadow_type = (ShadowType)StyleGetProperty("selected-shadow-type");
-                Gtk.Style.PaintBox(Style, args.Cr, StateType.Prelight, shadow_type,
-                    widget, "menuitem", x, y, width, height);
+                Gtk.Render.Background (StyleContext, args.Cr, x, y, width, height);
+                //Gtk.Style.PaintBox(Style, args.Cr, StateType.Prelight, shadow_type,
+                //    widget, "menuitem", x, y, width, height);
             } else {
 
                 args.Cr.Save ();
@@ -106,9 +107,9 @@ namespace Hyena.Widgets
                 y = Parent.Allocation.Y - widget.Allocation.Y;
                 width = Parent.Allocation.Width;
                 height = Parent.Allocation.Height;
-
-                Gtk.Style.PaintBox(Style, args.Cr, StateType.Normal, ShadowType.Out,
-                    widget, "menu", x, y, width, height);
+                Gtk.Render.Background (StyleContext, args.Cr, x, y, width, height);
+                //Gtk.Style.PaintBox(Style, args.Cr, StateType.Normal, ShadowType.Out,
+                //    widget, "menu", x, y, width, height);
             }
         }