Permalink
Browse files

Remove all unnecessary handler members

Cleanup many FxCop warnings
Include FxCop settings
  • Loading branch information...
1 parent 181a316 commit 25e50dfbdb0fb96f5c1baeab8d55b2d400c3c76f @cwensley cwensley committed Sep 28, 2013
Showing with 8,842 additions and 639 deletions.
  1. +8,100 −0 Source/Eto.FxCop
  2. +1 −1 Source/Eto.Platform.Gtk/Drawing/FontHandler.cs
  3. +1 −1 Source/Eto.Platform.Gtk/Drawing/FontTypefaceHandler.cs
  4. +6 −6 Source/Eto.Platform.Gtk/Forms/GtkWindow.cs
  5. +1 −1 Source/Eto.Platform.Mac/Conversions.cs
  6. +11 −1 Source/Eto.Platform.Mac/Eto.Platform.XamMac.csproj
  7. +6 −6 Source/Eto.Platform.Mac/Forms/ApplicationHandler.cs
  8. +0 −5 Source/Eto.Platform.Mac/Forms/Controls/MacEventView.cs
  9. +25 −12 Source/Eto.Platform.Mac/Forms/MacWindow.cs
  10. +2 −2 Source/Eto.Platform.Mac/KeyMap.cs
  11. +1 −1 Source/Eto.Platform.Windows/Conversions.cs
  12. +1 −1 Source/Eto.Platform.Windows/Forms/WindowHandler.cs
  13. +1 −1 Source/Eto.Platform.Wpf/Conversions.cs
  14. +7 −8 Source/Eto.Platform.Wpf/Eto.Platform.Wpf.csproj
  15. +2 −2 Source/Eto.Platform.Wpf/Forms/WpfWindow.cs
  16. +1 −1 Source/Eto.Platform.iOS/Drawing/FontTypefaceHandler.cs
  17. +1 −3 Source/Eto.Platform.iOS/Forms/Controls/ScrollableHandler.cs
  18. +4 −2 Source/Eto.Test/Eto.Test.Mac/Eto.Test.XamMac.csproj
  19. +16 −0 Source/Eto.Test/Eto.Test.Mac/linker.xml
  20. +0 −1 Source/Eto.Test/Eto.Test.iOS/Eto.Test.iOS.csproj
  21. +5 −5 Source/Eto.Test/Eto.Test/MainForm.cs
  22. +2 −2 Source/Eto.Test/Eto.Test/Sections/Behaviors/WindowsSection.cs
  23. +51 −58 Source/Eto.Test/Eto.Test/Sections/Serialization/Json/Test.json
  24. +2 −1 Source/Eto/Binding/Binding.cs
  25. +1 −0 Source/Eto/Binding/DualBinding.cs
  26. +6 −6 Source/Eto/Binding/ObjectBinding.cs
  27. +2 −1 Source/Eto/Binding/PropertyBinding.cs
  28. +11 −5 Source/Eto/Drawing/Bitmap.cs
  29. +1 −0 Source/Eto/Drawing/BitmapData.cs
  30. +1 −0 Source/Eto/Drawing/Brush.cs
  31. +3 −3 Source/Eto/Drawing/Color.cs
  32. +19 −2 Source/Eto/Drawing/DashStyle.cs
  33. +11 −4 Source/Eto/Drawing/Font.cs
  34. +34 −4 Source/Eto/Drawing/FontFamilies.cs
  35. +7 −7 Source/Eto/Drawing/Fonts.cs
  36. +20 −5 Source/Eto/Drawing/Graphics.cs
  37. +1 −0 Source/Eto/Drawing/GraphicsPath.cs
  38. +4 −8 Source/Eto/Drawing/Icon.cs
  39. +3 −3 Source/Eto/Drawing/ImageConverter.cs
  40. +2 −1 Source/Eto/Drawing/Padding.cs
  41. +28 −26 Source/Eto/Drawing/PaddingConverter.cs
  42. +1 −1 Source/Eto/Drawing/Palette.cs
  43. +2 −1 Source/Eto/Drawing/Point.cs
  44. +2 −1 Source/Eto/Drawing/PointConverter.cs
  45. +2 −1 Source/Eto/Drawing/PointF.cs
  46. +2 −1 Source/Eto/Drawing/PointFConverter.cs
  47. +2 −1 Source/Eto/Drawing/Rectangle.cs
  48. +1 −1 Source/Eto/Drawing/RectangleConverter.cs
  49. +2 −1 Source/Eto/Drawing/RectangleF.cs
  50. +1 −1 Source/Eto/Drawing/RectangleFConverter.cs
  51. +2 −1 Source/Eto/Drawing/Size.cs
  52. +2 −1 Source/Eto/Drawing/SizeConverter.cs
  53. +2 −1 Source/Eto/Drawing/SizeF.cs
  54. +2 −1 Source/Eto/Drawing/SizeFConverter.cs
  55. +16 −1 Source/Eto/Drawing/SolidBrush.cs
  56. +2 −1 Source/Eto/Drawing/XmlExtensions.cs
  57. +1 −1 Source/Eto/EmbeddedAssemblyLoader.cs
  58. +5 −9 Source/Eto/Eto.csproj
  59. +35 −26 Source/Eto/Forms/Actions/ActionItemCollection.cs
  60. +6 −5 Source/Eto/Forms/Actions/BaseAction.cs
  61. +2 −2 Source/Eto/Forms/Actions/ButtonAction.cs
  62. +6 −4 Source/Eto/Forms/Actions/CheckAction.cs
  63. +6 −4 Source/Eto/Forms/Actions/RadioAction.cs
  64. +11 −12 Source/Eto/Forms/Application.cs
  65. +2 −2 Source/Eto/Forms/Application.desktop.cs
  66. +3 −4 Source/Eto/Forms/Cells/ComboBoxCell.cs
  67. +13 −14 Source/Eto/Forms/Clipboard.cs
  68. +3 −4 Source/Eto/Forms/ColorDialog.cs
  69. +2 −3 Source/Eto/Forms/CommonDialog.cs
  70. +5 −4 Source/Eto/Forms/Controls/Drawable.cs
  71. +4 −3 Source/Eto/Forms/Controls/EnumComboBox.cs
  72. +4 −3 Source/Eto/Forms/Controls/EnumRadioButtonList.cs
  73. +15 −16 Source/Eto/Forms/Controls/Grid.cs
  74. +17 −18 Source/Eto/Forms/Controls/GridColumn.cs
  75. +8 −2 Source/Eto/Forms/Controls/GridViewSelection.cs
  76. +5 −6 Source/Eto/Forms/Controls/GroupBox.cs
  77. +3 −4 Source/Eto/Forms/Controls/ImageView.cs
  78. +1 −4 Source/Eto/Forms/Controls/ListBox.cs
  79. +2 −2 Source/Eto/Forms/Controls/ListBox.desktop.cs
  80. +5 −6 Source/Eto/Forms/Controls/ListControl.cs
  81. +10 −11 Source/Eto/Forms/Controls/ProgressBar.cs
  82. +0 −2 Source/Eto/Forms/Controls/SearchBox.cs
  83. +13 −14 Source/Eto/Forms/Controls/Slider.cs
  84. +5 −6 Source/Eto/Forms/Controls/TabPage.cs
  85. +13 −14 Source/Eto/Forms/Controls/TextArea.cs
  86. +5 −6 Source/Eto/Forms/Controls/TreeGridView.cs
  87. +2 −2 Source/Eto/Forms/Controls/TreeGridView.desktop.cs
  88. +12 −41 Source/Eto/Forms/Controls/TreeView.cs
  89. +2 −2 Source/Eto/Forms/Controls/TreeView.desktop.cs
  90. +9 −9 Source/Eto/Forms/DataStoreView.cs
  91. +8 −9 Source/Eto/Forms/Dialog.cs
  92. +15 −16 Source/Eto/Forms/FileDialog.cs
  93. +2 −3 Source/Eto/Forms/Form.cs
  94. +5 −1 Source/Eto/Forms/Key.cs
  95. +1 −1 Source/Eto/Forms/Layout/DockLayout.cs
  96. +1 −1 Source/Eto/Forms/Layout/DynamicTable.cs
  97. +1 −1 Source/Eto/Forms/Layout/PixelLayout.cs
  98. +1 −1 Source/Eto/Forms/Layout/TableLayout.cs
  99. +4 −1 Source/Eto/Forms/ListItem.cs
  100. +3 −4 Source/Eto/Forms/Menu/CheckMenuItem.cs
  101. +3 −4 Source/Eto/Forms/Menu/ContextMenu.cs
  102. +5 −5 Source/Eto/Forms/Menu/ImageMenuItem.cs
  103. +9 −10 Source/Eto/Forms/Menu/MenuActionItem.cs
  104. +3 −3 Source/Eto/Forms/Menu/MenuBar.cs
  105. +4 −5 Source/Eto/Forms/Menu/RadioMenuItem.cs
  106. +4 −5 Source/Eto/Forms/OpenFileDialog.cs
  107. +0 −2 Source/Eto/Forms/Printing/PrintPageEventArgs.cs
  108. +2 −1 Source/Eto/Forms/Range.cs
  109. +6 −7 Source/Eto/Forms/SelectFolderDialog.cs
  110. +6 −6 Source/Eto/Forms/UITimer.cs
  111. +14 −15 Source/Eto/Forms/Window.cs
  112. +30 −27 Source/Eto/Forms/Window.desktop.cs
  113. +4 −3 Source/Eto/Generator.cs
  114. +4 −6 Source/Eto/IO/EtoDirectoryInfo.cs
  115. +1 −1 Source/Eto/IO/EtoDriveInfo.cs
  116. +3 −5 Source/Eto/IO/EtoFileInfo.cs
  117. +1 −1 Source/Eto/IO/EtoSystemObjectInfo.cs
  118. +8 −8 Source/Eto/IO/VirtualDirectoryInfo.cs
  119. +2 −1 Source/Eto/IO/VirtualDirectoryType.cs
  120. +2 −1 Source/Eto/IO/VirtualFileEntry.cs
  121. +1 −1 Source/Eto/In32ArrayConverter.cs
  122. +2 −1 Source/Eto/ResourceNotFoundException.cs
  123. +1 −1 Source/Eto/Resources.cs
  124. +4 −3 Source/Eto/WidgetHandler.cs
  125. +1 −1 Source/Eto/Xaml/EtoXamlSchemaContext.cs
  126. +4 −2 Source/Eto/XmlExtensions.cs
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -110,7 +110,7 @@ public FontStyle FontStyle
{
get {
if (style == null) {
- style = FontStyle.Normal;
+ style = FontStyle.None;
if (Control.Weight == Pango.Weight.Bold)
style |= FontStyle.Bold;
if (Control.Style == Pango.Style.Italic)
@@ -18,7 +18,7 @@ public string Name
public FontStyle FontStyle
{
get {
- var style = FontStyle.Normal;
+ var style = FontStyle.None;
var description = Control.Describe ();
if (description.Style.HasFlag (Pango.Style.Italic))
style |= FontStyle.Italic;
@@ -30,7 +30,7 @@ public abstract class GtkWindow<T, W> : GtkDockContainer<T, W>, IWindow, IGtkWin
Rectangle? restoreBounds;
WindowState state;
WindowStyle style;
- bool topMost;
+ bool topmost;
public GtkWindow ()
{
@@ -76,13 +76,13 @@ public bool ShowInTaskbar
set { Control.SkipTaskbarHint = !value; }
}
- public bool TopMost
+ public bool Topmost
{
- get { return topMost; }
+ get { return topmost; }
set {
- if (topMost != value) {
- topMost = value;
- Control.KeepAbove = topMost;
+ if (topmost != value) {
+ topmost = value;
+ Control.KeepAbove = topmost;
}
}
}
@@ -91,7 +91,7 @@ public static NSFontTraitMask ToNS (this FontStyle style)
public static FontStyle ToEto (this NSFontTraitMask traits)
{
- var style = FontStyle.Normal;
+ var style = FontStyle.None;
if (traits.HasFlag (NSFontTraitMask.Bold))
style |= FontStyle.Bold;
if (traits.HasFlag (NSFontTraitMask.Italic))
@@ -6,6 +6,7 @@
<ProductVersion>10.0.0</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{15490F6C-C579-4A86-AD16-8D9B5B41EB87}</ProjectGuid>
+ <ProjectTypeGuids>{42C0BBD9-55CE-4FC1-8D90-A7348ABAFB23};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<RootNamespace>Eto.Platform.Mac</RootNamespace>
<AssemblyName>Eto.Platform.XamMac</AssemblyName>
@@ -21,6 +22,11 @@
<ConsolePause>False</ConsolePause>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<DebugSymbols>True</DebugSymbols>
+ <EnableCodeSigning>false</EnableCodeSigning>
+ <CreatePackage>false</CreatePackage>
+ <EnablePackageSigning>false</EnablePackageSigning>
+ <IncludeMonoRuntime>false</IncludeMonoRuntime>
+ <UseSGen>false</UseSGen>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -32,12 +38,16 @@
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<DefineConstants>OSX;DESKTOP;XAMMAC</DefineConstants>
<DebugSymbols>True</DebugSymbols>
+ <EnableCodeSigning>false</EnableCodeSigning>
+ <CreatePackage>false</CreatePackage>
+ <EnablePackageSigning>false</EnablePackageSigning>
+ <IncludeMonoRuntime>false</IncludeMonoRuntime>
+ <UseSGen>false</UseSGen>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Drawing" />
<Reference Include="System.Core" />
- <Reference Include="System.Xaml" />
<Reference Include="XamMac, Version=0.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065">
<Private>False</Private>
</Reference>
@@ -166,14 +166,14 @@ public void GetSystemActions (GenerateActionArgs args, bool addStandardItems)
args.Actions.Add (new MacButtonAction ("mac_print", "Print...", "print:") { Accelerator = Key.Application | Key.P });
if (addStandardItems) {
- var application = args.Menu.FindAddSubMenu (Widget.Name ?? "Application", 100);
+ var application = args.Menu.GetSubmenu (Widget.Name ?? "Application", 100);
application.Actions.AddSeparator (800);
application.Actions.Add ("mac_hide", 800);
application.Actions.Add ("mac_hideothers", 800);
application.Actions.Add ("mac_showall", 800);
application.Actions.AddSeparator (801);
- var file = args.Menu.FindAddSubMenu ("&File", 100);
+ var file = args.Menu.GetSubmenu ("&File", 100);
file.Actions.AddSeparator (900);
file.Actions.Add ("mac_performClose", 900);
@@ -183,7 +183,7 @@ public void GetSystemActions (GenerateActionArgs args, bool addStandardItems)
file.Actions.Add ("mac_print", 1000);
}
- var edit = args.Menu.FindAddSubMenu ("&Edit", 200);
+ var edit = args.Menu.GetSubmenu ("&Edit", 200);
edit.Actions.AddSeparator (100);
edit.Actions.Add ("mac_undo", 100);
edit.Actions.Add ("mac_redo", 100);
@@ -197,7 +197,7 @@ public void GetSystemActions (GenerateActionArgs args, bool addStandardItems)
edit.Actions.Add ("mac_selectAll", 200);
edit.Actions.AddSeparator (201);
- var window = args.Menu.FindAddSubMenu ("&Window", 900);
+ var window = args.Menu.GetSubmenu ("&Window", 900);
window.Actions.AddSeparator (100);
window.Actions.Add ("mac_performMiniaturize", 100);
window.Actions.Add ("mac_performZoom", 100);
@@ -208,13 +208,13 @@ public void GetSystemActions (GenerateActionArgs args, bool addStandardItems)
window.Actions.AddSeparator (201);
if (AddFullScreenMenuItem) {
- var view = args.Menu.FindAddSubMenu ("&View", 300);
+ var view = args.Menu.GetSubmenu ("&View", 300);
view.Actions.AddSeparator (900);
view.Actions.Add ("mac_toggleFullScreen", 900);
view.Actions.AddSeparator (901);
}
- var help = args.Menu.FindAddSubMenu ("&Help", 900);
+ var help = args.Menu.GetSubmenu ("&Help", 900);
// add separator so help menu is always shown even when empty
help.Actions.AddSeparator (0);
@@ -11,13 +11,8 @@ namespace Eto.Platform.Mac.Forms.Controls
{
public class MacEventView : NSView, IMacControl
{
- static NSString CIInputImage = new NSString("inputImage");
static NSString CIInputTransform = new NSString("inputTransform");
- static NSString CIInputSaturation = new NSString("inputSaturation");
static NSString CIOutputImage = new NSString("outputImage");
- static NSString CIInputRVector = new NSString("inputRVector");
- static NSString CIInputGVector = new NSString("inputGVector");
- static NSString CIInputBVector = new NSString("inputBVector");
static Selector selConvertSizeToBacking = new Selector("convertSizeToBacking:");
public static void Colourize(NSView control, Color color, Action drawAction)
@@ -110,7 +110,7 @@ public abstract class MacWindow<T, W> : MacDockContainer<T, W>, IWindow, IMacCon
bool setInitialSize;
WindowState? initialState;
bool maximizable = true;
- bool topMost;
+ bool topmost;
bool setInitialPosition = true;
public override NSView ContainerControl { get { return Control.ContentView; } }
@@ -137,7 +137,8 @@ public override Size MinimumSize
base.MinimumSize = value;
if (value != Size.Empty)
{
- Control.WillResize = (sender, frameSize) => {
+ Control.WillResize = (sender, frameSize) =>
+ {
if (value != Size.Empty)
{
return new SD.SizeF(Math.Max(frameSize.Width, value.Width), Math.Max(frameSize.Height, value.Height));
@@ -188,14 +189,16 @@ public override void AttachEvent(string handler)
};
break;
case Window.ClosingEvent:
- Control.WindowShouldClose = (sender) => {
+ Control.WindowShouldClose = (sender) =>
+ {
var args = new CancelEventArgs();
Widget.OnClosing(args);
return !args.Cancel;
};
break;
case Window.WindowStateChangedEvent:
- Control.ShouldZoom = (window, newFrame) => {
+ Control.ShouldZoom = (window, newFrame) =>
+ {
if (!Maximizable)
return false;
if (!window.IsZoomed)
@@ -238,7 +241,8 @@ public override void AttachEvent(string handler)
case Eto.Forms.Control.SizeChangedEvent:
{
Size? oldSize = null;
- AddControlObserver((NSString)"frame", e => {
+ AddControlObserver((NSString)"frame", e =>
+ {
var widget = (Window)e.Widget;
var newSize = widget.Size;
if (oldSize != newSize)
@@ -252,7 +256,8 @@ public override void AttachEvent(string handler)
case Window.LocationChangedEvent:
{
Point? oldLocation = null;
- AddControlObserver((NSString)"frame", e => {
+ AddControlObserver((NSString)"frame", e =>
+ {
var widget = (Window)e.Widget;
var newLocation = widget.Location;
if (oldLocation != newLocation)
@@ -291,7 +296,8 @@ protected void ConfigureWindow()
Control.ShowsResizeIndicator = true;
Control.AutorecalculatesKeyViewLoop = true;
//Control.Delegate = new MacWindowDelegate{ Handler = this };
- Control.WillReturnFieldEditor = (sender, forObject) => {
+ Control.WillReturnFieldEditor = (sender, forObject) =>
+ {
FieldEditorObject = forObject;
var control = forObject as IMacControl;
if (control != null)
@@ -380,14 +386,14 @@ public bool ShowInTaskbar
set;
}
- public bool TopMost
+ public bool Topmost
{
- get { return topMost; }
+ get { return topmost; }
set
{
- if (topMost != value)
+ if (topmost != value)
{
- topMost = value;
+ topmost = value;
Control.Level = value ? NSWindowLevel.PopUpMenu : NSWindowLevel.Normal;
}
}
@@ -617,7 +623,9 @@ protected virtual void PositionWindow()
setInitialPosition = false;
}
}
+
#region IMacContainer implementation
+
public override void SetContentSize(SD.SizeF contentSize)
{
if (MinimumSize != Size.Empty)
@@ -642,11 +650,14 @@ public override void SetContentSize(SD.SizeF contentSize)
}
Control.SetFrame(frame, false, false);
}
- else
+ else
Control.SetContentSize(contentSize);
}
+
#endregion
+
#region IMacWindow implementation
+
Rectangle? IMacWindow.RestoreBounds
{
get
@@ -668,7 +679,9 @@ NSWindow IMacWindow.Control
{
get { return this.Control; }
}
+
#endregion
+
public Screen Screen
{
get { return new Screen(Generator, new ScreenHandler(Control.Screen)); }
@@ -133,7 +133,7 @@ static KeyMap ()
//keymap.Add(30, Key.]);
//keymap.Add(33, Key.[);
keymap.Add(39, Key.Quote);
- keymap.Add(41, Key.SemiColon);
+ keymap.Add(41, Key.Semicolon);
keymap.Add(44, Key.ForwardSlash);
keymap.Add(47, Key.Period);
keymap.Add(43, Key.Comma);
@@ -192,7 +192,7 @@ static KeyMap ()
inverse.Add (Key.Equal, "=");
inverse.Add (Key.Grave, "`");
inverse.Add (Key.Minus, "-");
- inverse.Add (Key.SemiColon, ";");
+ inverse.Add (Key.Semicolon, ";");
inverse.Add (Key.Up, ((char)NSKey.UpArrow).ToString());
inverse.Add (Key.Down, ((char)NSKey.DownArrow).ToString());
inverse.Add (Key.Right, ((char)NSKey.RightArrow).ToString());
@@ -153,7 +153,7 @@ public static PrintSelection ToEto (this sdp.PrintRange value)
public static FontStyle ToEto (this sd.FontStyle style)
{
- var ret = FontStyle.Normal;
+ var ret = FontStyle.None;
if (style.HasFlag (sd.FontStyle.Bold))
ret |= FontStyle.Bold;
if (style.HasFlag (sd.FontStyle.Italic))
@@ -243,7 +243,7 @@ public virtual bool ShowInTaskbar
set { Control.ShowInTaskbar = value; }
}
- public virtual bool TopMost
+ public virtual bool Topmost
{
get { return Control.TopMost; }
set { Control.TopMost = value; }
@@ -316,7 +316,7 @@ public static void SetSize (sw.FrameworkElement element, Size size)
public static FontStyle Convert (sw.FontStyle fontStyle, sw.FontWeight fontWeight)
{
- var style = FontStyle.Normal;
+ var style = FontStyle.None;
if (fontStyle == sw.FontStyles.Italic)
style |= FontStyle.Italic;
if (fontStyle == sw.FontStyles.Oblique)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
@@ -210,12 +210,6 @@
</Compile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\Eto\Eto.csproj">
- <Project>{16289D2F-044C-49EF-83E9-9391AFF8FD2B}</Project>
- <Name>Eto</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
<EmbeddedResource Include="..\..\Libraries\WPFToolkit.Extended\Xceed.Wpf.Toolkit.dll">
<Link>CustomControls\Assemblies\Xceed.Wpf.Toolkit.dll</Link>
</EmbeddedResource>
@@ -281,7 +275,12 @@
<Target Name="AfterBuild">
</Target>
-->
- <ItemGroup />
+ <ItemGroup>
+ <ProjectReference Include="..\Eto\Eto.csproj">
+ <Project>{16289d2f-044c-49ef-83e9-9391aff8fd2b}</Project>
+ <Name>Eto</Name>
+ </ProjectReference>
+ </ItemGroup>
<ProjectExtensions>
<MonoDevelop>
<Properties>
@@ -238,7 +238,7 @@ public virtual bool ShowInTaskbar
set { Control.ShowInTaskbar = value; }
}
- public virtual bool TopMost
+ public virtual bool Topmost
{
get { return Control.Topmost; }
set { Control.Topmost = value; }
@@ -416,7 +416,7 @@ public void BringToFront ()
public void SendToBack ()
{
- if (TopMost)
+ if (Topmost)
return;
var hWnd = new sw.Interop.WindowInteropHelper (Control).Handle;
if (hWnd != IntPtr.Zero)
@@ -46,7 +46,7 @@ public FontTypefaceHandler (string fontName)
public FontStyle FontStyle {
get {
if (style == null) {
- style = FontStyle.Normal;
+ style = FontStyle.None;
var name = this.Name;
if (name.Contains ("Bold"))
style |= FontStyle.Bold;
@@ -140,9 +140,7 @@ public override Size GetPreferredSize(Size availableSize)
protected override Size GetNaturalSize(Size availableSize)
{
- return availableSize;
- var content = Content.GetMacAutoSizing();
- if (content != null)
+ if (Content != null)
{
return Content.GetPreferredSize(availableSize);
}
Oops, something went wrong.

0 comments on commit 25e50df

Please sign in to comment.