[mono/gtk-sharp] [2 commits] 10546e2f: MSBuild: fix the solution build (except audit and sample projects)

   Branch: refs/heads/master
     Home: https://github.com/mono/gtk-sharp
  Compare: https://github.com/mono/gtk-sharp/compare/efdf6463bbef...0d781f485f59

   Commit: 10546e2ffa7ddd34c2ce559cabec0a00f6f6f30f
   Author: Andrés G. Aragoneses <[email protected]> (knocte)
Committer: Bertrand Lorentz <[email protected]> (bl8)
     Date: 2013-11-02 14:48:58 GMT
      URL: https://github.com/mono/gtk-sharp/commit/10546e2ffa7ddd34c2ce559cabec0a00f6f6f30f

MSBuild: fix the solution build (except audit and sample projects)

This commit makes it possible to build any project of the gtk-sharp.sln
from an IDE (except audit and sample projects, which require a bit more
work).

This doesn't mean that autotools is deprecated, but just that it is more
comfortable to use an IDE when working on gtk-sharp because it will
offer better auto-completion, and will stop highlight misleading
semantic errors, from now on.

Changed paths:
  M gdk/gdk.csproj
  M gio/gio.csproj
  M gtk/gtk.csproj
  M pango/pango.csproj
  M sample/ManagedTreeViewDemo.cs
  M sample/Subclass.cs

Modified: gdk/gdk.csproj
===================================================================
@@ -229,5 +229,17 @@
       <Project>{3BF1D531-8840-4F15-8066-A9788D8C398B}</Project>
       <Name>glib</Name>
     </ProjectReference>
+    <ProjectReference Include="..\gio\gio.csproj">
+      <Project>{1C3BB17B-336D-432A-8952-4E979BC90867}</Project>
+      <Name>gio</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\cairo\cairo.csproj">
+      <Project>{364577DB-9728-4951-AC2C-EDF7A6FCC09D}</Project>
+      <Name>cairo</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\pango\pango.csproj">
+      <Project>{FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}</Project>
+      <Name>pango</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>
\ No newline at end of file

Modified: gio/gio.csproj
===================================================================
@@ -21,6 +21,7 @@
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
     <ConsolePause>false</ConsolePause>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <DebugType>none</DebugType>
@@ -30,11 +31,11 @@
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
     <ConsolePause>false</ConsolePause>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Compile Include="AppInfoAdapter.cs" />
-    <Compile Include="DBusInterfaceVTable.cs" />
     <Compile Include="IFile.cs" />
     <Compile Include="FileAdapter.cs" />
     <Compile Include="FileEnumerator.cs" />
@@ -366,6 +367,7 @@
     <Compile Include="generated\IInitable.cs" />
     <Compile Include="generated\ILoadableIcon.cs" />
     <Compile Include="generated\IMount.cs" />
+    <Compile Include="generated\SocketSourceFunc.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\glib\glib.csproj">
@@ -373,4 +375,7 @@
       <Name>glib</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

Modified: gtk/gtk.csproj
===================================================================
@@ -926,6 +926,16 @@
     <Compile Include="generated\ICellLayout.cs" />
     <Compile Include="generated\IEditable.cs" />
     <Compile Include="generated\IFileChooser.cs" />
+    <Compile Include="generated\IToolShell.cs" />
+    <Compile Include="generated\ITreeDragDest.cs" />
+    <Compile Include="generated\ITreeDragSource.cs" />
+    <Compile Include="generated\ITreeModel.cs" />
+    <Compile Include="generated\ITreeSortable.cs" />
+    <Compile Include="generated\IOrientable.cs" />
+    <Compile Include="generated\IPrintOperationPreview.cs" />
+    <Compile Include="generated\IRecentChooser.cs" />
+    <Compile Include="generated\IScrollable.cs" />
+    <Compile Include="generated\IStyleProvider.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -947,5 +957,13 @@
       <Project>{364577DB-9728-4951-AC2C-EDF7A6FCC09D}</Project>
       <Name>cairo</Name>
     </ProjectReference>
+    <ProjectReference Include="..\gio\gio.csproj">
+      <Project>{1C3BB17B-336D-432A-8952-4E979BC90867}</Project>
+      <Name>gio</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\pango\pango.csproj">
+      <Project>{FF422D8C-562F-4EA6-8590-9D1A5CD40AD4}</Project>
+      <Name>pango</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>

Modified: pango/pango.csproj
===================================================================
@@ -21,6 +21,7 @@
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
     <ConsolePause>false</ConsolePause>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <DebugType>none</DebugType>
@@ -30,6 +31,7 @@
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
     <ConsolePause>false</ConsolePause>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
@@ -187,4 +189,14 @@
     <Compile Include="generated\Win32MetricsInfo.cs" />
     <Compile Include="generated\WrapMode.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\glib\glib.csproj">
+      <Project>{3BF1D531-8840-4F15-8066-A9788D8C398B}</Project>
+      <Name>glib</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\cairo\cairo.csproj">
+      <Project>{364577DB-9728-4951-AC2C-EDF7A6FCC09D}</Project>
+      <Name>cairo</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file

Modified: sample/ManagedTreeViewDemo.cs
===================================================================
@@ -10,7 +10,7 @@ namespace GtkSamples {
 
 	using Gtk;
 
-	public class TreeViewDemo {
+	public class ManagedTreeViewDemo {
 		private static ListStore store = null;
 		
 		private class Pair {

Modified: sample/Subclass.cs
===================================================================
@@ -9,7 +9,7 @@ namespace GtkSamples {
 	using Gtk;
 	using System;
 
-	public class ButtonApp  {
+	public class ButtonAppSubclass  {
 
 		public static int Main (string[] args)
 		{

   Commit: 0d781f485f5977d4a1703bc67b6dcc03a5d07861
   Author: Bertrand Lorentz <[email protected]> (bl8)
     Date: 2013-11-02 14:53:29 GMT
      URL: https://github.com/mono/gtk-sharp/commit/0d781f485f5977d4a1703bc67b6dcc03a5d07861

gio: Delete DBusInterfaceVTable class

It was never included in the build, and never modified since it was
first created.

Removed paths:
  D gio/DBusInterfaceVTable.cs

Removed: gio/DBusInterfaceVTable.cs
===================================================================
@@ -1,117 +0,0 @@
-// Copyright (c) 2011 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the Lesser GNU General 
-// Public License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-using System;
-using System.Collections;
-using System.Runtime.InteropServices;
-
-namespace GLib {
-
-	public partial class DBusInterfaceVTable {
-
-		[StructLayout(LayoutKind.Sequential)]
-		struct NativeStruct {
-			public GLibSharp.DBusInterfaceMethodCallFuncNative method_call;
-			public GLibSharp.DBusInterfaceGetPropertyFuncNative get_property;
-			public GLibSharp.DBusInterfaceSetPropertyFuncNative set_property;
-
-			[MarshalAs (UnmanagedType.ByValArray, SizeConst=8)]
-			private IntPtr[] Padding;
-		}
-
-		IntPtr handle;
-		NativeStruct native_cbs;
-
-		~DBusInterfaceVTable ()
-		{
-			Marshaller.Free (handle);
-		}
-
-		public DBusInterfaceVTable (DBusInterfaceMethodCallFunc method_call, DBusInterfaceGetPropertyFunc get_property, DBusInterfaceSetPropertyFunc set_property)
-		{
-			this.method_call = method_call;
-			this.get_property = get_property;
-			this.set_property = set_property;
-			native_cbs.method_call = OnMethodCall;
-			native_cbs.get_property = OnGetProperty;
-			native_cbs.set_property = OnSetProperty;
-			handle = Marshaller.StructureToPtrAlloc (native_cbs);
-		}
-
-		public IntPtr OnGetProperty (IntPtr connection, IntPtr sender, IntPtr object_path, IntPtr interface_name, IntPtr property_name, out IntPtr error, IntPtr user_data)
-		{
-			error = IntPtr.Zero;
-
-			try {
-				if (get_property == null)
-					return IntPtr.Zero;
-
-				GLib.Variant __ret = get_property (GLib.Object.GetObject(connection) as GLib.DBusConnection, GLib.Marshaller.Utf8PtrToString (sender), GLib.Marshaller.Utf8PtrToString (object_path), GLib.Marshaller.Utf8PtrToString (interface_name), GLib.Marshaller.Utf8PtrToString (property_name));
-				return __ret == null ? IntPtr.Zero : __ret.Handle;
-			} catch (Exception e) {
-				GLib.ExceptionManager.RaiseUnhandledException (e, true);
-				// NOTREACHED: Above call does not return.
-				throw e;
-			}
-		}
-
-		public void OnMethodCall (IntPtr connection, IntPtr sender, IntPtr object_path, IntPtr interface_name, IntPtr method_name, IntPtr parameters, IntPtr invocation, IntPtr user_data)
-		{
-			try {
-				if (method_call == null)
-					return;
-
-				method_call (GLib.Object.GetObject(connection) as GLib.DBusConnection, GLib.Marshaller.Utf8PtrToString (sender), GLib.Marshaller.Utf8PtrToString (object_path), GLib.Marshaller.Utf8PtrToString (interface_name), GLib.Marshaller.Utf8PtrToString (method_name), new GLib.Variant(parameters), GLib.Object.GetObject(invocation) as GLib.DBusMethodInvocation);
-			} catch (Exception e) {
-				GLib.ExceptionManager.RaiseUnhandledException (e, false);
-			}
-		}
-
-		public bool OnSetProperty (IntPtr connection, IntPtr sender, IntPtr object_path, IntPtr interface_name, IntPtr property_name, IntPtr value, out IntPtr error, IntPtr user_data)
-		{
-			error = IntPtr.Zero;
-
-			try {
-				if (set_property == null)
-					return false;
-
-				return set_property (GLib.Object.GetObject(connection) as GLib.DBusConnection, GLib.Marshaller.Utf8PtrToString (sender), GLib.Marshaller.Utf8PtrToString (object_path), GLib.Marshaller.Utf8PtrToString (interface_name), GLib.Marshaller.Utf8PtrToString (property_name), new GLib.Variant(value));
-			} catch (Exception e) {
-				GLib.ExceptionManager.RaiseUnhandledException (e, false);
-				return false;
-			}
-		}
-
-		DBusInterfaceMethodCallFunc method_call;
-		public GLib.DBusInterfaceMethodCallFunc MethodCall {
-			get { return method_call; }
-			set { method_call = value; }
-		}
-
-		GLib.DBusInterfaceGetPropertyFunc get_property;
-		public GLib.DBusInterfaceGetPropertyFunc GetProperty {
-			get { return get_property; }
-			set { get_property = value; }
-		}
-
-		GLib.DBusInterfaceSetPropertyFunc set_property;
-		public GLib.DBusInterfaceSetPropertyFunc SetProperty {
-			get { return set_property; }
-			set { set_property = value; }
-		}
-	}
-}
_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches