Standardize default constructors (needed for xaml), pass null as gene…

…rator instead of Generator.Current for better flexibility in the future (e.g. design mode)

Source/Eto/Drawing/Bitmap.cs

@@ -175,7 +175,7 @@ public static Bitmap FromResource (Assembly asm, string resourceName)
 		/// </summary>
 		[Obsolete ("use Bitmap.FromResource instead")]
 		public Bitmap (Assembly asm, string resourceName)
-			: this (Generator.Current)
+			: this (null)
 		{
 			if (asm == null) asm = Assembly.GetCallingAssembly ();
 			using (var stream = asm.GetManifestResourceStream (resourceName)) {

Source/Eto/Drawing/GraphicsPath.cs

@@ -365,11 +365,16 @@ public static IGraphicsPath Create (Generator generator = null)
 			return generator.Create<IGraphicsPathHandler> ();
 		}
 
+		public GraphicsPath()
+			: this((Generator)null)
+		{
+		}
+
 		/// <summary>
 		/// Initializes a new instance of the GraphicsPath class
 		/// </summary>
 		/// <param name="generator">Platform generator for the object, or null to use the current generator</param>
-		public GraphicsPath (Generator generator = null)
+		public GraphicsPath (Generator generator)
 		{
 			Handler = Create (generator);
 		}

Source/Eto/Drawing/Icon.cs

@@ -50,7 +50,7 @@ public Icon (Generator generator, IIcon handler) : base(generator, handler)
 		/// Initializes a new instance of the Icon class with the contents of the specified <paramref name="stream"/>
 		/// </summary>
 		/// <param name="stream">Stream to load the content from</param>
-		public Icon (Stream stream) : base(Generator.Current, typeof(IIcon))
+		public Icon (Stream stream, Generator generator = null) : base(generator, typeof(IIcon))
 		{
 			Handler.Create (stream);
 		}
@@ -59,7 +59,7 @@ public Icon (Stream stream) : base(Generator.Current, typeof(IIcon))
 		/// Intitializes a new instanc of the Icon class with the contents of the specified <paramref name="fileName"/>
 		/// </summary>
 		/// <param name="fileName">Name of the file to loat the content from</param>
-		public Icon (string fileName) : base(Generator.Current, typeof(IIcon))
+		public Icon (string fileName, Generator generator = null) : base(generator, typeof(IIcon))
 		{
 			Handler.Create (fileName);
 		}
@@ -70,14 +70,14 @@ public Icon (string fileName) : base(Generator.Current, typeof(IIcon))
 		/// <param name="assembly">Assembly to load the resource from</param>
 		/// <param name="resourceName">Fully qualified name of the resource to load</param>
 		/// <returns>A new instance of an Icon loaded with the contents of the specified resource</returns>
-		public static Icon FromResource (Assembly assembly, string resourceName)
+		public static Icon FromResource (Assembly assembly, string resourceName, Generator generator = null)
 		{
 			if (assembly == null)
 				assembly = Assembly.GetCallingAssembly ();
 			using (var stream = assembly.GetManifestResourceStream(resourceName)) {
 				if (stream == null)
 					throw new ResourceNotFoundException (assembly, resourceName);
-				return new Icon (stream);
+				return new Icon (stream, generator);
 			}
 		}
 
@@ -90,17 +90,17 @@ public static Icon FromResource (Assembly assembly, string resourceName)
 		/// </remarks>
 		/// <param name="resourceName">Fully qualified name of the resource to load</param>
 		/// <returns>A new instance of an Icon loaded with the contents of the specified resource</returns>
-		public static Icon FromResource (string resourceName)
+		public static Icon FromResource (string resourceName, Generator generator = null)
 		{
 			var asm = Assembly.GetCallingAssembly ();
-			return FromResource (asm, resourceName);
+			return FromResource (asm, resourceName, generator);
 		}
 
 		/// <summary>
 		/// Obsolete. Do not use.
 		/// </summary>
 		[Obsolete("Use Icon.FromResource instead")]
-		public Icon (Assembly asm, string resourceName) : base(Generator.Current, typeof(IIcon))
+		public Icon (Assembly asm, string resourceName) : base(null, typeof(IIcon))
 		{
 			if (asm == null)
 				asm = Assembly.GetCallingAssembly ();

Source/Eto/Drawing/IndexedBitmap.cs

@@ -50,8 +50,8 @@ public class IndexedBitmap : Image
 		/// <param name="width">Width of the bitmap in pixels</param>
 		/// <param name="height">Height of the bitmap in pixels</param>
 		/// <param name="bitsPerPixel">Number of bits per pixel, usually 4 (16 colours), 8 (64 colours), or 8 (256 colours)</param>
-		public IndexedBitmap (int width, int height, int bitsPerPixel)
-			: this(Generator.Current, width, height, bitsPerPixel)
+		public IndexedBitmap (int width, int height, int bitsPerPixel, Generator generator = null)
+			: this(generator, width, height, bitsPerPixel)
 		{
 		}
 

Source/Eto/Drawing/Region.cs

@@ -34,8 +34,8 @@ public class Region : InstanceWidget
 		/// <summary>
 		/// Initializes a new instance of the Region class
 		/// </summary>
-		public Region ()
-			: this (Generator.Current)
+		public Region()
+			: this((Generator)null)
 		{
 		}
 

Source/Eto/Forms/Actions/ActionCollection.cs

@@ -7,11 +7,11 @@ public class ActionCollection : KeyedCollection<string, BaseAction>
 	{
 		readonly Generator generator;
 
-		public ActionCollection ()
-			: this(Generator.Current)
+		public ActionCollection()
+			: this((Generator)null)
 		{
 		}
-		
+
 		public ActionCollection (Generator generator)
 			: this(generator, null)
 		{

Source/Eto/Forms/Actions/RadioAction.desktop.cs

@@ -9,7 +9,7 @@ public partial class RadioAction
 
 		public override MenuItem GenerateMenuItem(Generator generator)
 		{
-			var mi = new RadioMenuItem(generator, (Controller != null) ? Controller.menuItem : null);
+			var mi = new RadioMenuItem((Controller != null) ? Controller.menuItem : null, generator);
 			mi.Text = MenuText;
 			mi.Shortcut = Accelerator;
 			mi.Enabled = Enabled;

Source/Eto/Forms/Cells/CheckBoxCell.cs

@@ -19,13 +19,13 @@ public CheckBoxCell (string property)
 			Binding = new PropertyBinding (property);
 		}
 
-		public CheckBoxCell ()
-			: this(Generator.Current)
+		public CheckBoxCell()
+			: this((Generator)null)
 		{
 		}
-		
-		public CheckBoxCell (Generator g)
-			: base(g, typeof(ICheckBoxCell), true)
+
+		public CheckBoxCell (Generator generator)
+			: base(generator, typeof(ICheckBoxCell), true)
 		{
 		}
 	}

Source/Eto/Forms/Cells/ComboBoxCell.cs

@@ -21,9 +21,9 @@ public ComboBoxCell (string property)
 		{
 			Binding = new PropertyBinding (property);
 		}
-		
-		public ComboBoxCell ()
-			: this (Generator.Current)
+
+		public ComboBoxCell()
+			: this((Generator)null)
 		{
 		}
 

Source/Eto/Forms/Cells/DrawableCell.cs

@@ -45,13 +45,13 @@ public class DrawableCell : Cell
 	{
 		public Action<DrawableCellPaintArgs> PaintHandler { get; set; }
 
-		public DrawableCell ()
-			: this(Generator.Current)
+		public DrawableCell()
+			: this((Generator)null)
 		{
 		}
 
-		public DrawableCell(Generator g)
-			: base(g, typeof(IDrawableCell), true)
+		public DrawableCell(Generator generator)
+			: base(generator, typeof(IDrawableCell), true)
 		{
 		}
 	}

Source/Eto/Forms/Cells/ImageTextCell.cs

@@ -25,13 +25,13 @@ public ImageTextCell (string imageProperty, string textProperty)
 			TextBinding = new PropertyBinding(textProperty);
 		}
 
-		public ImageTextCell ()
-			: this(Generator.Current)
+		public ImageTextCell()
+			: this((Generator)null)
 		{
 		}
-		
-		public ImageTextCell (Generator g)
-			: base(g, typeof(IImageTextCell), true)
+
+		public ImageTextCell (Generator generator)
+			: base(generator, typeof(IImageTextCell), true)
 		{
 		}
 	}

Source/Eto/Forms/Cells/ImageViewCell.cs

@@ -19,13 +19,13 @@ public ImageViewCell (string property)
 			Binding = new PropertyBinding (property);
 		}
 
-		public ImageViewCell ()
-			: this(Generator.Current)
+		public ImageViewCell()
+			: this((Generator)null)
 		{
 		}
-		
-		public ImageViewCell (Generator g)
-			: base(g, typeof(IImageViewCell), true)
+
+		public ImageViewCell (Generator generator)
+			: base(generator, typeof(IImageViewCell), true)
 		{
 		}
 	}

Source/Eto/Forms/Cells/TextBoxCell.cs

@@ -19,13 +19,13 @@ public TextBoxCell (string property)
 			Binding = new PropertyBinding (property);
 		}
 
-		public TextBoxCell ()
-			: this(Generator.Current)
+		public TextBoxCell()
+			: this((Generator)null)
 		{
 		}
-		
-		public TextBoxCell (Generator g)
-			: base(g, typeof(ITextBoxCell), true)
+
+		public TextBoxCell (Generator generator)
+			: base(generator, typeof(ITextBoxCell), true)
 		{
 		}
 	}

Source/Eto/Forms/Clipboard.cs

@@ -30,11 +30,11 @@ public class Clipboard : InstanceWidget
 	{
 		new IClipboard Handler { get { return (IClipboard)base.Handler; } }
 
-		public Clipboard ()
-			: this(Generator.Current)
+		public Clipboard()
+			: this((Generator)null)
 		{
 		}
-		
+
 		public Clipboard (Generator generator)
 			: base(generator, typeof(IClipboard))
 		{

Source/Eto/Forms/ColorDialog.cs

@@ -20,13 +20,13 @@ public virtual void OnColorChanged (EventArgs e)
 				ColorChanged (this, e);
 		}
 
-		public ColorDialog ()
-			: this (Generator.Current)
+		public ColorDialog()
+			: this((Generator)null)
 		{
 		}
-		
-		public ColorDialog (Generator g)
-			: this (g, typeof(IColorDialog))
+
+		public ColorDialog (Generator generator)
+			: this (generator, typeof(IColorDialog))
 		{
 		}
 

Source/Eto/Forms/Controls/CheckBox.cs

@@ -26,16 +26,17 @@ public virtual void OnCheckedChanged(EventArgs e)
 			Properties.TriggerEvent(CheckedChangedKey, this, e);
 		}
 
-		public CheckBox() : this(Generator.Current)
+		public CheckBox()
+			: this((Generator)null)
 		{
 		}
 
-		public CheckBox(Generator g) : this(g, typeof(ICheckBox))
+		public CheckBox(Generator generator) : this(generator, typeof(ICheckBox))
 		{
 		}
 
-		protected CheckBox(Generator g, Type type, bool initialize = true)
-			: base(g, type, initialize)
+		protected CheckBox(Generator generator, Type type, bool initialize = true)
+			: base(generator, type, initialize)
 		{
 		}
 

Source/Eto/Forms/Controls/ComboBox.cs

@@ -5,19 +5,21 @@ namespace Eto.Forms
 	public interface IComboBox : IListControl
 	{
 	}
-	
+
 	public class ComboBox : ListControl
 	{
-		public ComboBox () : this (Generator.Current)
+		public ComboBox()
+			: this((Generator)null)
 		{
 		}
 
-		public ComboBox (Generator g) : this (g, typeof(IComboBox))
+		public ComboBox(Generator generator)
+			: this(generator, typeof(IComboBox))
 		{
 		}
-		
-		protected ComboBox (Generator g, Type type, bool initialize = true)
-			: base (g, type, initialize)
+
+		protected ComboBox(Generator generator, Type type, bool initialize = true)
+			: base(generator, type, initialize)
 		{
 		}
 	}

Source/Eto/Forms/Controls/DateTimePicker.cs

@@ -35,11 +35,11 @@ public virtual void OnValueChanged (EventArgs e)
 				ValueChanged (this, e);
 		}
 
-		public DateTimePicker ()
-			: this (Generator.Current)
+		public DateTimePicker()
+			: this((Generator)null)
 		{
 		}
-		
+
 		public DateTimePicker (Generator generator)
 			: this (generator, typeof(IDateTimePicker))
 		{

Source/Eto/Forms/Controls/Drawable.cs

@@ -46,7 +46,7 @@ public partial class Drawable : DockContainer
 		public event EventHandler<PaintEventArgs> Paint;
 
 		public Drawable()
-			: this(Generator.Current)
+			: this((Generator)null)
 		{
 		}
 

Source/Eto/Forms/Controls/Drawable.mobile.cs

@@ -11,11 +11,11 @@ public partial interface IDrawable
 	public partial class Drawable
 	{
 		public Drawable (bool largeCanvas)
-			: this(Generator.Current, largeCanvas)
+			: this(null, largeCanvas)
 		{
 		}
 
-		public Drawable (Generator g, bool largeCanvas) : base(g, typeof(IDrawable))
+		public Drawable (Generator generator, bool largeCanvas) : base(generator, typeof(IDrawable))
 		{
 			Handler.Create (largeCanvas);
 		}

Source/Eto/Forms/Controls/EnumComboBox.cs

@@ -73,16 +73,16 @@ protected virtual void OnAddValue (AddValueEventArgs<T> e)
 		/// <summary>
 		/// Initializes a new instance of the EnumComboBox
 		/// </summary>
-		public EnumComboBox ()
-			: this (Generator.Current)
+		public EnumComboBox()
+			: this((Generator)null)
 		{
 		}
 
 		/// <summary>
 		/// Initializes a new instance of the EnumComboBox with the specified generator
 		/// </summary>
 		/// <param name="generator">platform generator</param>
-		protected EnumComboBox (Generator generator)
+		public EnumComboBox (Generator generator)
 			: base (generator)
 		{
 		}