work in progressTestC

4 files changed, 20 insertions, 19 deletions

diff --git a/Tests/BasicTests.cs b/Tests/BasicTests.cs
index d48364e8..0f9447a9 100644
--- a/Tests/BasicTests.cs
+++ b/Tests/BasicTests.cs
@@ -148,19 +148,20 @@ namespace Tests
 
 			//testFiles = new string [] { @"Interfaces/Unsorted/testFileDialog.crow" };
 			//testFiles = new string [] { @"Interfaces/Divers/colorPicker.crow" };
-			testFiles = new string [] { @"Interfaces/Divers/welcome.crow" };
+			//testFiles = new string [] { @"Interfaces/Divers/welcome.crow" };
+			testFiles = new string [] { "#Tests.Interfaces.GraphicObject.0.crow" };
 			//testFiles = new string [] { @"#Tests.Interfaces.perfMsr.crow" };
-			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/GraphicObject", "*.crow")).ToArray ();
-			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Container", "*.crow")).ToArray ();
-			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Group", "*.crow")).ToArray ();
-			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Stack", "*.crow")).ToArray ();
-			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/TemplatedControl", "*.crow")).ToArray ();
-			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/TemplatedContainer", "*.crow")).ToArray ();
-			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/TemplatedGroup", "*.crow")).ToArray ();
-			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Splitter", "*.crow")).ToArray ();
-			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Wrapper", "*.crow")).ToArray ();
-			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Divers", "*.crow")).ToArray ();
-			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Unsorted", "*.crow")).ToArray ();
+//			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/GraphicObject", "*.crow")).ToArray ();
+//			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Container", "*.crow")).ToArray ();
+//			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Group", "*.crow")).ToArray ();
+//			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Stack", "*.crow")).ToArray ();
+//			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/TemplatedControl", "*.crow")).ToArray ();
+//			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/TemplatedContainer", "*.crow")).ToArray ();
+//			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/TemplatedGroup", "*.crow")).ToArray ();
+//			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Splitter", "*.crow")).ToArray ();
+//			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Wrapper", "*.crow")).ToArray ();
+//			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Divers", "*.crow")).ToArray ();
+//			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Unsorted", "*.crow")).ToArray ();
 
 			object tc = Color.AirForceBlueRaf;
 			Load (testFiles [idx]).DataSource = this;
diff --git a/Tests/CrowWindow.cs b/Tests/CrowWindow.cs
index a578fa64..e1dd5375 100644
--- a/Tests/CrowWindow.cs
+++ b/Tests/CrowWindow.cs
@@ -182,11 +182,11 @@ namespace Crow
 			if (ifaceControl.Count == 0)//create default orthogonal interface
 				addInterfaceControler (new InterfaceControler (
 					new Rectangle (0, 0, this.ClientRectangle.Width, this.ClientRectangle.Height)));
-			ifaceControl [interfaceIdx].CrowInterface.AddWidget (g);
+			ifaceControl [interfaceIdx].CrowInterface.AddChild (g);
 			return g;
 		}
 		public void DeleteWidget (GraphicObject g, int interfaceIdx = 0){
-			ifaceControl [interfaceIdx].CrowInterface.DeleteWidget (g);
+			ifaceControl [interfaceIdx].CrowInterface.RemoveChild (g);
 		}
 		public GraphicObject Load (string path, int interfaceIdx = 0){
 			if (ifaceControl.Count == 0)//create default orthogonal interface
@@ -203,7 +203,7 @@ namespace Crow
 			return null;
 		}
 		public void ClearInterface (int interfaceIdx = 0){
-			ifaceControl [interfaceIdx].CrowInterface.ClearInterface ();
+			ifaceControl [interfaceIdx].CrowInterface.ClearChildren ();
 		}
 		/// <summary>Override this method for your OpenGL rendering calls</summary>
 		public virtual void OnRender(FrameEventArgs e)
diff --git a/Tests/InterfaceControler.cs b/Tests/InterfaceControler.cs
index 869c3896..264ebd21 100644
--- a/Tests/InterfaceControler.cs
+++ b/Tests/InterfaceControler.cs
@@ -162,7 +162,7 @@ namespace Crow
 
 			while (true) {
 				CrowInterface.Update ();
-				Thread.Sleep (3);
+				Thread.Sleep (1000);
 			}
 		}
 
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 9eb845a1..b6c705c5 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -85,9 +85,6 @@
     <None Include="Interfaces\tmpDirItem.goml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Interfaces\GraphicObject\0.crow">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="Interfaces\GraphicObject\1.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -356,6 +353,9 @@
     <EmbeddedResource Include="Interfaces\CheckBox2.imlt" />
     <EmbeddedResource Include="Interfaces\perfMsr.crow" />
     <EmbeddedResource Include="ui\showcase.crow" />
+    <EmbeddedResource Include="Interfaces\GraphicObject\0.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Crow.csproj">