Author: toshok
Date: 2007-09-19 19:50:47 -0400 (Wed, 19 Sep 2007)
New Revision: 86055

Modified:
   trunk/moon/src/demo.cpp
Log:
get this compiling again

Modified: trunk/moon/src/demo.cpp
===================================================================
--- trunk/moon/src/demo.cpp     2007-09-19 23:42:33 UTC (rev 86054)
+++ trunk/moon/src/demo.cpp     2007-09-19 23:50:47 UTC (rev 86055)
@@ -1,5 +1,5 @@
-#define VIDEO_DEMO
-#define XAML_DEMO
+//#define VIDEO_DEMO
+//#define XAML_DEMO
 #include <config.h>
 #include <string.h>
 #include <gtk/gtk.h>
@@ -65,21 +65,6 @@
 }
 
 static void
-button_press_event2 (GtkWidget *widget, GdkEventButton *e, gpointer data)
-{
-       Surface *t = (Surface *) data;
-       Type::Kind kind;
-
-       printf ("button_press_event\n");
-
-       printf ("Loading...\n");
-       UIElement *ee = xaml_create_from_file 
("../test/xaml/test-shape-ellipse.xaml", true, &kind);
-       printf ("Loading... %p\n", ee);
-       if (ee != NULL)
-               t->Attach (ee);
-}
-
-static void
 button_release_event (GtkWidget *widget, GdkEventButton *e, gpointer data)
 {
   //   printf ("button_release_event\n");
@@ -212,7 +197,7 @@
 
                gtk_window_set_title (GTK_WINDOW (w), file);
                
-               UIElement *e = xaml_create_from_file (file, true, &kind);
+               UIElement *e = (UIElement*)xaml_create_from_file (NULL, file, 
true, &kind);
                if (e == NULL){
                        printf ("Was not able to load the file\n");
                        return 1;
@@ -222,7 +207,6 @@
                        return 1;
                }
 
-               gtk_signal_connect (GTK_OBJECT (t->GetDrawingArea()), 
"button_press_event", G_CALLBACK (button_press_event2), t);
                t->Attach (e);
        } else {
                NameScope *namescope = new NameScope();
@@ -311,7 +295,7 @@
                panel_child_add (canvas, tb);
                
 #ifdef XAML_DEMO
-               panel_child_add (canvas, xaml_create_from_str (NULL, "<Line 
Stroke='Blue' X1='10' Y1='10' X2='10' Y2='300' />", false, NULL));
+               panel_child_add (canvas, (UIElement*)xaml_create_from_str 
(NULL, "<Line Stroke='Blue' X1='10' Y1='10' X2='10' Y2='300' />", false, NULL));
 #endif
                
 #ifdef VIDEO_DEMO

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to