]> O.S.I.I.S - jp/crow.git/commitdiff
instanciator
authorjpbruyere <jp.bruyere@hotmail.com>
Tue, 9 Aug 2016 01:37:43 +0000 (03:37 +0200)
committerjpbruyere <jp.bruyere@hotmail.com>
Tue, 9 Aug 2016 01:39:47 +0000 (03:39 +0200)
1  2 
Crow.csproj
src/CompilerServices/Bindings.cs
src/GraphicObjects/Container.cs
src/GraphicObjects/GraphicObject.cs
src/GraphicObjects/PrivateContainer.cs
src/Interface.cs

diff --cc Crow.csproj
Simple merge
Simple merge
index 69e3a3b4136a9e08ba1d6bb64b7b89c4f5b64c47,9acbf03a465d1559f52b6e878847cf6e09131377..fb4a7834f80ed229eeb58a1874e9a879a33c3d29
@@@ -25,9 -26,10 +25,9 @@@ namespace Cro
                        get { return child; }
                        set { child = value; }
                }
-               public virtual T SetChild<T> (T _child)
+               public virtual void SetChild(GraphicObject _child)
                {
-                       return base.SetChild (_child);
 -                      Debug.WriteLine ("container setChild");
+                       base.SetChild (_child);
                }
  
                #region IXmlSerializable
Simple merge
index 8793ba4533e052b7c10542ef379106bdb881493e,51d766048a40cbf9b1e12fa0dde3463a6df9a44a..a6f52f2910ba92ca871036a2aead08bbccf0a38c
@@@ -67,8 -68,8 +67,6 @@@ namespace Cro
                                child.RegisteredLayoutings = LayoutingType.None;
                                child.RegisterForLayouting (LayoutingType.Sizing);
                        }
 -                      Debug.WriteLine ("privateContainer setChild");
--
-                       return (T)_child;
                }
  
                #region GraphicObject Overrides
Simple merge