Author: rolf
Date: 2007-10-17 10:52:18 -0400 (Wed, 17 Oct 2007)
New Revision: 87682
Modified:
trunk/moon/src/ChangeLog
trunk/moon/src/dependencyobject.cpp
trunk/moon/src/dependencyobject.h
trunk/moon/src/runtime.h
Log:
* dependencyobject.h: Add a GET_OBJ_ID macro that resolves to -1 if
OBJECT_TRACKING isn't defined.
* runtime.h: Enable the contextual downloader warning again.
* dependencyobject.cpp: Fix build when DEBUG is defined.
Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog 2007-10-17 14:51:03 UTC (rev 87681)
+++ trunk/moon/src/ChangeLog 2007-10-17 14:52:18 UTC (rev 87682)
@@ -1,3 +1,10 @@
+2007-10-17 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
+
+ * dependencyobject.h: Add a GET_OBJ_ID macro that resolves to -1 if
+ OBJECT_TRACKING isn't defined.
+ * runtime.h: Enable the contextual downloader warning again.
+ * dependencyobject.cpp: Fix build when DEBUG is defined.
+
2007-10-16 Jeffrey Stedfast <[EMAIL PROTECTED]>
* text.cpp (OnPropertyChanged): When intercepting non-TextBlock
Modified: trunk/moon/src/dependencyobject.cpp
===================================================================
--- trunk/moon/src/dependencyobject.cpp 2007-10-17 14:51:03 UTC (rev 87681)
+++ trunk/moon/src/dependencyobject.cpp 2007-10-17 14:52:18 UTC (rev 87682)
@@ -643,7 +643,7 @@
#if DEBUG
// Check for circular families
DependencyObject *current = parent;
- do while (current != NULL) {
+ while (current != NULL) {
g_assert (current != this);
current = current->GetParent ();
}
Modified: trunk/moon/src/dependencyobject.h
===================================================================
--- trunk/moon/src/dependencyobject.h 2007-10-17 14:51:03 UTC (rev 87681)
+++ trunk/moon/src/dependencyobject.h 2007-10-17 14:52:18 UTC (rev 87682)
@@ -18,6 +18,12 @@
#define OBJECT_TRACKING 1
#endif
+#if OBJECT_TRACKING
+#define GET_OBJ_ID(x) (x ? x->id : 0)
+#else
+#define GET_OBJ_ID(x) (-1)
+#endif
+
class EventObject;
typedef void (*EventHandler) (EventObject *sender, gpointer calldata, gpointer
closure);
Modified: trunk/moon/src/runtime.h
===================================================================
--- trunk/moon/src/runtime.h 2007-10-17 14:51:03 UTC (rev 87681)
+++ trunk/moon/src/runtime.h 2007-10-17 14:52:18 UTC (rev 87682)
@@ -114,7 +114,7 @@
if (surface) {
return surface->CreateDownloader ();
} else {
- //printf ("Surface::CreateDownloader (%p, ID: %i):
Unable to create contextual downloader.\n", element, element ? element->id : 0);
+ printf ("Surface::CreateDownloader (%p, ID: %i): Unable
to create contextual downloader.\n", element, GET_OBJ_ID (element));
//print_stack_trace ();
return new Downloader ();
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
