Author: miguel
Date: 2007-06-04 20:44:39 -0400 (Mon, 04 Jun 2007)
New Revision: 78604
Modified:
trunk/moon/src/ChangeLog
trunk/moon/src/demo.cpp
trunk/moon/src/runtime.cpp
trunk/moon/src/runtime.h
Log:
2007-06-04 Miguel de Icaza <[EMAIL PROTECTED]>
* runtime.h: Make the "Base" refcounting class the base for
DependencyObject.
Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog 2007-06-05 00:38:55 UTC (rev 78603)
+++ trunk/moon/src/ChangeLog 2007-06-05 00:44:39 UTC (rev 78604)
@@ -1,5 +1,8 @@
2007-06-04 Miguel de Icaza <[EMAIL PROTECTED]>
+ * runtime.h: Make the "Base" refcounting class the base for
+ DependencyObject.
+
* ffvideo.cpp: Set audio initialization to zero for now, so we can
continue debugging.
Modified: trunk/moon/src/demo.cpp
===================================================================
--- trunk/moon/src/demo.cpp 2007-06-05 00:38:55 UTC (rev 78603)
+++ trunk/moon/src/demo.cpp 2007-06-05 00:44:39 UTC (rev 78604)
@@ -43,7 +43,7 @@
gtk_init (&argc, &argv);
g_thread_init (NULL);
gdk_threads_init ();
-
+ runtime_init ();
w = gtk_window_new (GTK_WINDOW_TOPLEVEL);
Modified: trunk/moon/src/runtime.cpp
===================================================================
--- trunk/moon/src/runtime.cpp 2007-06-05 00:38:55 UTC (rev 78603)
+++ trunk/moon/src/runtime.cpp 2007-06-05 00:44:39 UTC (rev 78604)
@@ -423,7 +423,6 @@
for (il = children.list; il != NULL; il = il->next){
UIElement *item = (UIElement *) il->data;
-
item->render (s, x, y, width, height);
}
}
Modified: trunk/moon/src/runtime.h
===================================================================
--- trunk/moon/src/runtime.h 2007-06-05 00:38:55 UTC (rev 78603)
+++ trunk/moon/src/runtime.h 2007-06-05 00:44:39 UTC (rev 78604)
@@ -115,10 +115,24 @@
};
//
+// This guy provide reference counting
+//
+#define BASE_FLOATS 0x80000000
+
+class Base {
+ public:
+ uint32_t refcount;
+ Base () : refcount(BASE_FLOATS) {}
+};
+
+void base_ref (Base *base);
+void base_unref (Base *base);
+
+//
// DependencyObject
//
-class DependencyObject {
+class DependencyObject : public Base {
public:
enum Type {
INVALID = 0,
@@ -150,20 +164,6 @@
DependencyObject::Type type;
};
-//
-// This guy provide reference counting
-//
-#define BASE_FLOATS 0x80000000
-
-class Base {
- public:
- uint32_t refcount;
- Base () : refcount(BASE_FLOATS) {}
-};
-
-void base_ref (Base *base);
-void base_unref (Base *base);
-
class Brush : public Base {
GSList *listeners;
public:
@@ -419,6 +419,7 @@
UIElement *xaml_create_from_str (const char *xaml);
+void runtime_init ();
G_END_DECLS
#endif
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
