Author: miguel
Date: 2007-06-04 02:21:15 -0400 (Mon, 04 Jun 2007)
New Revision: 78533
Modified:
trunk/moon/src/ffvideo.cpp
trunk/moon/src/runtime.cpp
trunk/moon/src/runtime.h
trunk/moon/test/Makefile
trunk/moon/test/demo.cs
Log:
Simple test, crashes in DependencyObject, that stuff is not ready yet
Modified: trunk/moon/src/ffvideo.cpp
===================================================================
--- trunk/moon/src/ffvideo.cpp 2007-06-04 06:20:35 UTC (rev 78532)
+++ trunk/moon/src/ffvideo.cpp 2007-06-04 06:21:15 UTC (rev 78533)
@@ -512,6 +512,7 @@
cairo_set_source_surface (s->cairo, video_cairo_surface, this->x,
this->y);
cairo_rectangle (s->cairo, this->x, this->y, this->w, this->h);
+
cairo_fill (s->cairo);
cairo_restore (s->cairo);
Modified: trunk/moon/src/runtime.cpp
===================================================================
--- trunk/moon/src/runtime.cpp 2007-06-04 06:20:35 UTC (rev 78532)
+++ trunk/moon/src/runtime.cpp 2007-06-04 06:21:15 UTC (rev 78533)
@@ -441,3 +441,8 @@
s->render (s, x, y, width, height);
}
+void *
+surface_get_drawing_area (Surface *s)
+{
+ return s->drawing_area;
+}
Modified: trunk/moon/src/runtime.h
===================================================================
--- trunk/moon/src/runtime.h 2007-06-04 06:20:35 UTC (rev 78532)
+++ trunk/moon/src/runtime.h 2007-06-04 06:21:15 UTC (rev 78533)
@@ -363,8 +363,10 @@
void surface_destroy (Surface *s);
void surface_repaint (Surface *s, int x, int y, int width, int height);
+void *surface_get_drawing_area (Surface *s);
+
UIElement *xaml_create_from_file (const char *filename);
Modified: trunk/moon/test/Makefile
===================================================================
--- trunk/moon/test/Makefile 2007-06-04 06:20:35 UTC (rev 78532)
+++ trunk/moon/test/Makefile 2007-06-04 06:21:15 UTC (rev 78533)
@@ -1,2 +1,2 @@
demo.exe: demo.cs
- gmcs demo.cs -pkg:gtk-sharp-2.0
\ No newline at end of file
+ gmcs demo.cs -pkg:gtk-sharp-2.0 -pkg:silver
\ No newline at end of file
Modified: trunk/moon/test/demo.cs
===================================================================
--- trunk/moon/test/demo.cs 2007-06-04 06:20:35 UTC (rev 78532)
+++ trunk/moon/test/demo.cs 2007-06-04 06:21:15 UTC (rev 78533)
@@ -1,6 +1,8 @@
using System;
using System.Runtime.InteropServices;
using Gtk;
+using System.Windows.Controls;
+using System.Windows.Shapes;
class X {
[DllImport ("moon")]
@@ -17,10 +19,16 @@
Window w = new Window ("Top");
DrawingArea da = new DrawingArea (surface_get_drawing_area
(surface));
-
w.Add (da);
w.ShowAll ();
+ //
+ // Now, the SL API
+ //
+ Canvas c = new Canvas (surface);
+ Rectangle r = new Rectangle ();
+ c.Children.Add (r);
+
Application.Run ();
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
