sasas

[psychlops/silverlight.git] / test4 / MainPage.xaml.cs

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