X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=test4%2FMainPage.xaml.cs;h=5c0b625b7b3cf3cb961461a44075ae17a632da14;hb=97a97a46267462940a24f18ad5bbd0f77006dfd9;hp=cfe5cf59faabf07ff1f11f40a203949108cf020d;hpb=0f2c6de1f33621bdcba280810c1d756eb0d6a704;p=psychlops%2Fsilverlight.git

diff --git a/test4/MainPage.xaml.cs b/test4/MainPage.xaml.cs
index cfe5cf5..5c0b625 100644
--- a/test4/MainPage.xaml.cs
+++ b/test4/MainPage.xaml.cs
@@ -6,7 +6,7 @@ namespace PsychlopsSilverlight4test
 	{
 		//System.Collections.Generic.IEnumerator<int> main_routine;
 		public System.Windows.Controls.Image master;
-		public PsychlopsMain main;
+		public PsychlopsSilverlightApp.PsychlopsMain main;
 #if DEBUG
 		public System.Windows.Controls.TextBlock DebugConsole;
 #endif
@@ -30,7 +30,7 @@ namespace PsychlopsSilverlight4test
 			//main_routine.DoWork += new System.ComponentModel.DoWorkEventHandler(psychlops_main);
 			//main_routine.RunWorkerAsync();
 
-			main = new PsychlopsMain();
+			main = new PsychlopsSilverlightApp.PsychlopsMain();
 //			Psychlops.AppState.statusBar.
 			Psychlops.Internal.Main.routine = new System.Threading.Thread(main.psychlops_main);
 			Psychlops.Internal.Main.routine.Start();
@@ -41,14 +41,6 @@ namespace PsychlopsSilverlight4test
 			//Psychlops.Internal.Main.widgetStack = Controller;
 			AppStatusBar.Text = "Now starting Psychlops environment... please wait a minute";
 
-
-			var ur = new System.Uri("Resources/logo.png", System.UriKind.RelativeOrAbsolute);
-			var bitmap = new System.Windows.Media.Imaging.BitmapImage(ur);
-			var img = new System.Windows.Controls.Image();
-			img.Source = bitmap;
-			System.Windows.Controls.Canvas.SetLeft(img, 100);
-			System.Windows.Controls.Canvas.SetTop(img, 100);
-			LayoutRoot.Children.Add(img);
 		}
 		protected void getFocusMouseEnter(object sender, System.Windows.Input.MouseEventArgs e) {
 			this.Focus();