diff options
author | Michael Hutchinson <mhutch@xamarin.com> | 2013-08-13 09:10:20 +0400 |
---|---|---|
committer | Michael Hutchinson <mhutch@xamarin.com> | 2013-08-13 09:10:20 +0400 |
commit | a47449b42baa78c5fe1a293629bcec9564ec849c (patch) | |
tree | 85a9b14190c18dd4d0bc8b964e9c3ef4a29c1823 /main/src/addins/MonoDevelop.DesignerSupport | |
parent | a44f19c645b2014a9548ed6123ca6654630afff4 (diff) |
Revert "Revert "Fix hundreds of warnings""
Please use an up to date Mono.
This reverts commit 54a64a751b7070237368b7967cc4a6adff6bc468.
Diffstat (limited to 'main/src/addins/MonoDevelop.DesignerSupport')
3 files changed, 15 insertions, 16 deletions
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs index 824cb716c8..affe9b2689 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs +++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ToolboxWidget.cs @@ -234,7 +234,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox else messageLayout.SetText (MonoDevelop.Core.GettextCatalog.GetString ("There are no tools available for the current document.")); cr.MoveTo (Allocation.Width * 1 / 6, 12); - cr.Color = Style.Text (StateType.Normal).ToCairoColor (); + cr.SetSourceColor (Style.Text (StateType.Normal).ToCairoColor ()); Pango.CairoHelper.ShowLayout (cr, messageLayout); messageLayout.Dispose (); ((IDisposable)cr).Dispose (); @@ -242,7 +242,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox } var backColor = Style.Base (StateType.Normal).ToCairoColor (); - cr.Color = backColor; + cr.SetSourceColor (backColor); cr.Rectangle (area.X, area.Y, area.Width, area.Height); cr.Fill (); @@ -261,7 +261,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox using (var pat = new Cairo.LinearGradient (xpos, ypos, xpos, ypos + itemDimension.Height)) { pat.AddColorStop (0, CategoryBackgroundGradientStartColor); pat.AddColorStop (1, CategoryBackgroundGradientEndColor); - cr.Pattern = pat; + cr.SetSource (pat); cr.Fill (); } if (lastCategory == null || lastCategory.IsExpanded || lastCategory.AnimatingExpand) { @@ -270,13 +270,13 @@ namespace MonoDevelop.DesignerSupport.Toolbox } cr.MoveTo (0, ypos + itemDimension.Height - 0.5); cr.LineTo (xpos + Allocation.Width, ypos + itemDimension.Height - 0.5); - cr.Color = CategoryBorderColor; + cr.SetSourceColor (CategoryBorderColor); cr.LineWidth = 1; cr.Stroke (); headerLayout.SetText (category.Text); int width, height; - cr.Color = CategoryLabelColor; + cr.SetSourceColor (CategoryLabelColor); layout.GetPixelSize (out width, out height); cr.MoveTo (xpos + CategoryLeftPadding, ypos + (itemDimension.Height - height) / 2); Pango.CairoHelper.ShowLayout (cr, headerLayout); @@ -290,7 +290,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox }, delegate (Category curCategory, Item item, Gdk.Size itemDimension) { if (item == SelectedItem) { - cr.Color = Style.Base (StateType.Selected).ToCairoColor (); + cr.SetSourceColor (Style.Base (StateType.Selected).ToCairoColor ()); cr.Rectangle (xpos, ypos, itemDimension.Width, itemDimension.Height); cr.Fill (); } @@ -300,7 +300,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox layout.SetText (item.Text); int width, height; layout.GetPixelSize (out width, out height); - cr.Color = Style.Text (item != this.SelectedItem ? StateType.Normal : StateType.Selected).ToCairoColor (); + cr.SetSourceColor (Style.Text (item != this.SelectedItem ? StateType.Normal : StateType.Selected).ToCairoColor ()); cr.MoveTo (xpos + ItemLeftPadding + IconSize.Width + ItemIconTextItemSpacing, ypos + (itemDimension.Height - height) / 2); Pango.CairoHelper.ShowLayout (cr, layout); } else { @@ -309,7 +309,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox } if (item == mouseOverItem) { - cr.Color = Style.Dark (StateType.Prelight).ToCairoColor (); + cr.SetSourceColor (Style.Dark (StateType.Prelight).ToCairoColor ()); cr.Rectangle (xpos + 0.5, ypos + 0.5, itemDimension.Width - 1, itemDimension.Height - 1); cr.Stroke (); } @@ -321,7 +321,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox // Closing line when animating the last group of the toolbox cr.MoveTo (area.X, ypos + 0.5); cr.RelLineTo (area.Width, 0); - cr.Color = CategoryBorderColor; + cr.SetSourceColor (CategoryBorderColor); cr.Stroke (); } @@ -344,7 +344,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox // Clear the area where the category will be drawn since it will be // drawn over the items being hidden/shown - cr.Color = backColor; + cr.SetSourceColor (backColor); cr.Rectangle (area.X, newypos, area.Width, ypos - lastCategoryYpos); cr.Fill (); ypos = newypos; diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineNodeComparer.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineNodeComparer.cs index 394723fa55..c6bc863697 100755 --- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineNodeComparer.cs +++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineNodeComparer.cs @@ -41,7 +41,7 @@ namespace MonoDevelop.DesignerSupport /// This implementation uses a primary sort key (int based on node's group) and /// a secondary sort key (string based on node's name) for comparison. /// </remarks> - /// <seealso cref="MonoDevelop.DesignerSupport.ClassOutlineSortingProperties"/> + /// <seealso cref="MonoDevelop.DesignerSupport.ClassOutlineSettings"/> class ClassOutlineNodeComparer : IComparer<TreeIter> { const string DEFAULT_REGION_NAME = "region"; @@ -54,13 +54,12 @@ namespace MonoDevelop.DesignerSupport /// <param name="ambience"> /// The ambience used on retrieval of node names. /// </param> - /// <param name="properties"> + /// <param name="settings"> /// The properties used on retrieval of node sort keys and sorting settings. /// </param> /// <param name="model"> /// The model containing the nodes to compare. /// </param> - public ClassOutlineNodeComparer (Ambience ambience, ClassOutlineSettings settings, TreeModel model) { this.ambience = ambience; @@ -91,9 +90,9 @@ namespace MonoDevelop.DesignerSupport /// The second tree node that will be compared. /// </param> /// <returns> - /// Less than zero if nodeA < nodeB + /// Less than zero if nodeA < nodeB /// Zero if nodeA == nodeB. - /// Greater than zero if nodeA > nodeB. + /// Greater than zero if nodeA > nodeB. /// </returns> public int CompareNodes (TreeModel model, TreeIter node1, TreeIter node2) { diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs index efc4f636c5..4f6d8bbd13 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs +++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs @@ -54,7 +54,7 @@ namespace MonoDevelop.DesignerSupport /// The string comparison ignores symbols (e.g. sort 'Foo()' next to '~Foo()'). /// </remarks> /// <seealso cref="MonoDevelop.DesignerSupport.ClassOutlineNodeComparer"/> - /// <seealso cref="MonoDevelop.DesignerSupport.ClassOutlineSortingProperties"/> + /// <seealso cref="MonoDevelop.DesignerSupport.ClassOutlineSettings"/> public class ClassOutlineTextEditorExtension : TextEditorExtension, IOutlinedDocument { ParsedDocument lastCU = null; |