Merge branch 'master' of git.sourceforge.jp:/gitroot/psychlops/silverlight

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

diff --git a/test4/MainPage.xaml.cs b/test4/MainPage.xaml.cs
index a303773..3925f7b 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