Merge branch 'master' into multi-toolkit-lluis

Conflicts:
	Xwt.Gtk/Xwt.GtkBackend/ButtonBackend.cs
	Xwt.Gtk/Xwt.GtkBackend/GtkEngine.cs
	Xwt.Gtk/Xwt.GtkBackend/GtkWorkarounds.cs
	Xwt.Gtk/Xwt.GtkBackend/NotebookBackend.cs
	Xwt.Gtk/Xwt.GtkBackend/PopoverBackend.cs
	Xwt.Gtk/Xwt.GtkBackend/Util.cs
	Xwt.Gtk/Xwt.GtkBackend/WidgetBackend.cs
	Xwt.Mac/Xwt.Mac.csproj
	Xwt.Mac/Xwt.Mac/MacEngine.cs
	Xwt.sln
	Xwt/Xwt.Backends/BackendHost.cs
	Xwt/Xwt.Backends/IFrontend.cs
	Xwt/Xwt.Backends/ToolkitEngineBackend.cs
	Xwt/Xwt.Drawing/Context.cs
	Xwt/Xwt.Drawing/Font.cs
	Xwt/Xwt.Drawing/Gradient.cs
	Xwt/Xwt.Drawing/Image.cs
	Xwt/Xwt.Drawing/ImageBuilder.cs
	Xwt/Xwt.Drawing/ImagePattern.cs
	Xwt/Xwt.Drawing/TextLayout.cs
	Xwt/Xwt.Engine/WidgetRegistry.cs
	Xwt/Xwt.csproj
	Xwt/Xwt/Application.cs
	Xwt/Xwt/Clipboard.cs
	Xwt/Xwt/ComboBox.cs
	Xwt/Xwt/Dialog.cs
	Xwt/Xwt/DragOperation.cs
	Xwt/Xwt/FileDialog.cs
	Xwt/Xwt/ListBox.cs
	Xwt/Xwt/ListView.cs
	Xwt/Xwt/Menu.cs
	Xwt/Xwt/MenuButton.cs
	Xwt/Xwt/MenuItem.cs
	Xwt/Xwt/MessageDialog.cs
	Xwt/Xwt/Popover.cs
	Xwt/Xwt/SelectColorDialog.cs
	Xwt/Xwt/SelectFolderDialog.cs
	Xwt/Xwt/Spinner.cs
	Xwt/Xwt/TreeView.cs
	Xwt/Xwt/Widget.cs
	Xwt/Xwt/Window.cs
	Xwt/Xwt/XwtComponent.cs
	Xwt/Xwt/XwtObject.cs

1 files changed, 11 insertions, 0 deletions

diff --git a/Xwt.sln b/Xwt.sln
index 69b068aa..f0205569 100644
--- a/Xwt.sln
+++ b/Xwt.sln
@@ -26,8 +26,11 @@ Global
 		Release|Any CPU = Release|Any CPU

 		Win-Debug|Any CPU = Win-Debug|Any CPU

 		Debug|Any CPU = Debug|Any CPU

+		Linux-Debug|Any CPU = Linux-Debug|Any CPU

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{0AF50CE4-E455-4A9D-92AD-711CBD068A55}.Linux-Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{0AF50CE4-E455-4A9D-92AD-711CBD068A55}.Linux-Debug|Any CPU.Build.0 = Debug|Any CPU

 		{0AF50CE4-E455-4A9D-92AD-711CBD068A55}.Mac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{0AF50CE4-E455-4A9D-92AD-711CBD068A55}.Mac-Debug|Any CPU.Build.0 = Debug|Any CPU

 		{0AF50CE4-E455-4A9D-92AD-711CBD068A55}.Release|Any CPU.ActiveCfg = Release|Any CPU

@@ -48,12 +51,16 @@ Global
 		{3C7623A9-9E16-41F6-BBB2-0B550F28E749}.Release|Any CPU.Build.0 = Release|Any CPU

 		{3C7623A9-9E16-41F6-BBB2-0B550F28E749}.Win-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{3C7623A9-9E16-41F6-BBB2-0B550F28E749}.Win-Debug|Any CPU.Build.0 = Debug|Any CPU

+		{88C04B85-B69B-47B4-AB9F-64F6DD4E0897}.Linux-Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{88C04B85-B69B-47B4-AB9F-64F6DD4E0897}.Linux-Debug|Any CPU.Build.0 = Debug|Any CPU

 		{88C04B85-B69B-47B4-AB9F-64F6DD4E0897}.Mac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{88C04B85-B69B-47B4-AB9F-64F6DD4E0897}.Mac-Debug|Any CPU.Build.0 = Debug|Any CPU

 		{88C04B85-B69B-47B4-AB9F-64F6DD4E0897}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{88C04B85-B69B-47B4-AB9F-64F6DD4E0897}.Release|Any CPU.Build.0 = Release|Any CPU

 		{88C04B85-B69B-47B4-AB9F-64F6DD4E0897}.Win-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{88C04B85-B69B-47B4-AB9F-64F6DD4E0897}.Win-Debug|Any CPU.Build.0 = Debug|Any CPU

+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Linux-Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Linux-Debug|Any CPU.Build.0 = Debug|Any CPU

 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Mac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Mac-Debug|Any CPU.Build.0 = Debug|Any CPU

 		{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}.Release|Any CPU.ActiveCfg = Release|Any CPU

@@ -65,17 +72,21 @@ Global
 		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.Release|Any CPU.Build.0 = Release|Any CPU

 		{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}.Win-Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Linux-Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Linux-Debug|Any CPU.Build.0 = Debug|Any CPU

 		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Mac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Mac-Debug|Any CPU.Build.0 = Debug|Any CPU

 		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Release|Any CPU.Build.0 = Release|Any CPU

 		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Win-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{C3887A93-B2BD-4097-8E2F-3A063EFF32FD}.Win-Debug|Any CPU.Build.0 = Debug|Any CPU

+		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.Linux-Debug|Any CPU.ActiveCfg = Linux-Debug|Any CPU

 		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.Mac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.Release|Any CPU.Build.0 = Release|Any CPU

 		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.Win-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{C93D746E-1586-4D4F-B411-BF5A966E6A08}.Win-Debug|Any CPU.Build.0 = Debug|Any CPU

+		{E41F4448-15C3-4E95-B310-FD333FDF5D2F}.Linux-Debug|Any CPU.ActiveCfg = Linux-Debug|Any CPU

 		{E41F4448-15C3-4E95-B310-FD333FDF5D2F}.Mac-Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{E41F4448-15C3-4E95-B310-FD333FDF5D2F}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{E41F4448-15C3-4E95-B310-FD333FDF5D2F}.Release|Any CPU.Build.0 = Release|Any CPU