Browse Source

Fix some compiler warnings.

pull/76/merge
Daniel Grunwald 13 years ago
parent
commit
2dfa409711
  1. 2190
      SharpDevelop.sln
  2. 4
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/UIHelpers.cs
  3. 1
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj
  4. 63
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/DesignTimeProperties.cs
  5. 9
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/MarkupCompatibilityProperties.cs
  6. 1
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/WpfDesign.csproj

2190
SharpDevelop.sln

File diff suppressed because it is too large Load Diff

4
src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/UIHelpers.cs → src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/UIHelpers.cs

@ -8,9 +8,9 @@ using System.Text;
using System.Windows; using System.Windows;
using System.Windows.Media; using System.Windows.Media;
namespace ICSharpCode.WpfDesign namespace ICSharpCode.WpfDesign.Designer
{ {
public static class UIHelpers static class UIHelpers
{ {
public static DependencyObject GetParentObject(this DependencyObject child) public static DependencyObject GetParentObject(this DependencyObject child)
{ {

1
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj

@ -231,6 +231,7 @@
<Compile Include="Services\XamlErrorService.cs" /> <Compile Include="Services\XamlErrorService.cs" />
<Compile Include="SharedInstances.cs" /> <Compile Include="SharedInstances.cs" />
<Compile Include="ThumbnailView\ThumbnailView.cs" /> <Compile Include="ThumbnailView\ThumbnailView.cs" />
<Compile Include="UIHelpers.cs" />
<Compile Include="Xaml\XamlEditOperations.cs" /> <Compile Include="Xaml\XamlEditOperations.cs" />
<Compile Include="Xaml\XamlLoadSettings.cs" /> <Compile Include="Xaml\XamlLoadSettings.cs" />
<Compile Include="Xaml\XamlModelCollectionElementsCollection.cs" /> <Compile Include="Xaml\XamlModelCollectionElementsCollection.cs" />

63
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/DesignTimeProperties.cs

@ -13,16 +13,25 @@ namespace ICSharpCode.WpfDesign.XamlDom
{ {
#region IsHidden #region IsHidden
/// <summary>
/// Getter for the <see cref="IsHiddenProperty"/>
/// </summary>
public static bool GetIsHidden(DependencyObject obj) public static bool GetIsHidden(DependencyObject obj)
{ {
return (bool)obj.GetValue(IsHiddenProperty); return (bool)obj.GetValue(IsHiddenProperty);
} }
/// <summary>
/// Setter for the <see cref="IsHiddenProperty"/>
/// </summary>
public static void SetIsHidden(DependencyObject obj, bool value) public static void SetIsHidden(DependencyObject obj, bool value)
{ {
obj.SetValue(IsHiddenProperty, value); obj.SetValue(IsHiddenProperty, value);
} }
/// <summary>
/// Design-time IsHidden property
/// </summary>
public static readonly DependencyProperty IsHiddenProperty = public static readonly DependencyProperty IsHiddenProperty =
DependencyProperty.RegisterAttached("IsHidden", typeof(bool), typeof(DesignTimeProperties)); DependencyProperty.RegisterAttached("IsHidden", typeof(bool), typeof(DesignTimeProperties));
@ -30,99 +39,139 @@ namespace ICSharpCode.WpfDesign.XamlDom
#region IsLocked #region IsLocked
/// <summary>
/// Getter for the <see cref="IsLockedProperty"/>
/// </summary>
public static bool GetIsLocked(DependencyObject obj) public static bool GetIsLocked(DependencyObject obj)
{ {
return (bool)obj.GetValue(IsLockedProperty); return (bool)obj.GetValue(IsLockedProperty);
} }
/// <summary>
/// Setter for the <see cref="IsLockedProperty"/>
/// </summary>
public static void SetIsLocked(DependencyObject obj, bool value) public static void SetIsLocked(DependencyObject obj, bool value)
{ {
obj.SetValue(IsLockedProperty, value); obj.SetValue(IsLockedProperty, value);
} }
/// <summary>
/// Design-time IsLocked property.
/// </summary>
public static readonly DependencyProperty IsLockedProperty = public static readonly DependencyProperty IsLockedProperty =
DependencyProperty.RegisterAttached("IsLocked", typeof(bool), typeof(DesignTimeProperties)); DependencyProperty.RegisterAttached("IsLocked", typeof(bool), typeof(DesignTimeProperties));
#endregion #endregion
#region DataContext #region DataContext
/// <summary>
/// Getter for the <see cref="DataContextProperty"/>
/// </summary>
public static object GetDataContext(DependencyObject obj) public static object GetDataContext(DependencyObject obj)
{ {
return (object)obj.GetValue(DataContextProperty); return (object)obj.GetValue(DataContextProperty);
} }
/// <summary>
/// Setter for the <see cref="DataContextProperty"/>
/// </summary>
public static void SetDataContext(DependencyObject obj, bool value) public static void SetDataContext(DependencyObject obj, bool value)
{ {
obj.SetValue(DataContextProperty, value); obj.SetValue(DataContextProperty, value);
} }
/// <summary>
/// Design-time data context
/// </summary>
public static readonly DependencyProperty DataContextProperty = public static readonly DependencyProperty DataContextProperty =
DependencyProperty.RegisterAttached("DataContext", typeof(object), typeof(DesignTimeProperties)); DependencyProperty.RegisterAttached("DataContext", typeof(object), typeof(DesignTimeProperties));
#endregion #endregion
#region DesignSource #region DesignSource
/// <summary>
/// Getter for the <see cref="DesignSourceProperty"/>
/// </summary>
public static object GetDesignSource(DependencyObject obj) public static object GetDesignSource(DependencyObject obj)
{ {
return (object)obj.GetValue(DesignSourceProperty); return (object)obj.GetValue(DesignSourceProperty);
} }
/// <summary>
/// Setter for the <see cref="DesignSourceProperty"/>
/// </summary>
public static void SetDesignSource(DependencyObject obj, bool value) public static void SetDesignSource(DependencyObject obj, bool value)
{ {
obj.SetValue(DesignSourceProperty, value); obj.SetValue(DesignSourceProperty, value);
} }
/// <summary>
/// Design-time design source
/// </summary>
public static readonly DependencyProperty DesignSourceProperty = public static readonly DependencyProperty DesignSourceProperty =
DependencyProperty.RegisterAttached("DesignSource", typeof(object), typeof(DesignTimeProperties)); DependencyProperty.RegisterAttached("DesignSource", typeof(object), typeof(DesignTimeProperties));
#endregion #endregion
#region DesignWidth #region DesignWidth
/// <summary>
/// Getter for the <see cref="DesignWidthProperty"/>
/// </summary>
public static double GetDesignWidth(DependencyObject obj) public static double GetDesignWidth(DependencyObject obj)
{ {
return (double)obj.GetValue(DesignWidthProperty); return (double)obj.GetValue(DesignWidthProperty);
} }
/// <summary>
/// Setter for the <see cref="DesignWidthProperty"/>
/// </summary>
public static void SetDesignWidth(DependencyObject obj, double value) public static void SetDesignWidth(DependencyObject obj, double value)
{ {
obj.SetValue(DesignWidthProperty, value); obj.SetValue(DesignWidthProperty, value);
} }
/// <summary>
/// Design-time width
/// </summary>
public static readonly DependencyProperty DesignWidthProperty = public static readonly DependencyProperty DesignWidthProperty =
DependencyProperty.RegisterAttached("DesignWidth", typeof(double), typeof(DesignTimeProperties)); DependencyProperty.RegisterAttached("DesignWidth", typeof(double), typeof(DesignTimeProperties));
#endregion #endregion
#region DesignHeight #region DesignHeight
/// <summary>
/// Getter for the <see cref="DesignHeightProperty"/>
/// </summary>
public static double GetDesignHeight(DependencyObject obj) public static double GetDesignHeight(DependencyObject obj)
{ {
return (double)obj.GetValue(DesignHeightProperty); return (double)obj.GetValue(DesignHeightProperty);
} }
/// <summary>
/// Setter for the <see cref="DesignHeightProperty"/>
/// </summary>
public static void SetDesignHeight(DependencyObject obj, double value) public static void SetDesignHeight(DependencyObject obj, double value)
{ {
obj.SetValue(DesignHeightProperty, value); obj.SetValue(DesignHeightProperty, value);
} }
/// <summary>
/// Design-time height
/// </summary>
public static readonly DependencyProperty DesignHeightProperty = public static readonly DependencyProperty DesignHeightProperty =
DependencyProperty.RegisterAttached("DesignHeight", typeof(double), typeof(DesignTimeProperties)); DependencyProperty.RegisterAttached("DesignHeight", typeof(double), typeof(DesignTimeProperties));
#endregion #endregion
#region LayoutRounding #region LayoutRounding
public static bool GetLayoutRounding(DependencyObject obj) public static bool GetLayoutRounding(DependencyObject obj)
{ {
return (bool)obj.GetValue(DesignHeightProperty); return (bool)obj.GetValue(DesignLayoutRounding);
} }
public static void SetLayoutRounding(DependencyObject obj, bool value) public static void SetLayoutRounding(DependencyObject obj, bool value)
{ {
obj.SetValue(DesignHeightProperty, value); obj.SetValue(DesignLayoutRounding, value);
} }
public static readonly DependencyProperty DesignLayoutRounding = public static readonly DependencyProperty DesignLayoutRounding =

9
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/MarkupCompatibilityProperties.cs

@ -13,16 +13,25 @@ namespace ICSharpCode.WpfDesign.XamlDom
{ {
#region Ignorable #region Ignorable
/// <summary>
/// Getter for the <see cref="IgnorableProperty"/>
/// </summary>
public static string GetIgnorable(DependencyObject obj) public static string GetIgnorable(DependencyObject obj)
{ {
return (string)obj.GetValue(IgnorableProperty); return (string)obj.GetValue(IgnorableProperty);
} }
/// <summary>
/// Setter for the <see cref="IgnorableProperty"/>
/// </summary>
public static void SetIgnorable(DependencyObject obj, string value) public static void SetIgnorable(DependencyObject obj, string value)
{ {
obj.SetValue(IgnorableProperty, value); obj.SetValue(IgnorableProperty, value);
} }
/// <summary>
/// Gets/Sets whether a XAML namespace may be ignored by the XAML parser.
/// </summary>
public static readonly DependencyProperty IgnorableProperty = public static readonly DependencyProperty IgnorableProperty =
DependencyProperty.RegisterAttached("Ignorable", typeof(string), typeof(MarkupCompatibilityProperties)); DependencyProperty.RegisterAttached("Ignorable", typeof(string), typeof(MarkupCompatibilityProperties));

1
src/AddIns/DisplayBindings/WpfDesign/WpfDesign/Project/WpfDesign.csproj

@ -117,7 +117,6 @@
<Compile Include="ServiceRequiredException.cs" /> <Compile Include="ServiceRequiredException.cs" />
<Compile Include="Services.cs" /> <Compile Include="Services.cs" />
<Compile Include="Tools.cs" /> <Compile Include="Tools.cs" />
<Compile Include="UIHelpers.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Page Include="PropertyGrid\Editors\ComboBoxEditor.xaml"> <Page Include="PropertyGrid\Editors\ComboBoxEditor.xaml">

Loading…
Cancel
Save