Author: toshok
Date: 2007-07-05 15:20:27 -0400 (Thu, 05 Jul 2007)
New Revision: 81426
Modified:
trunk/moon/src/ChangeLog
trunk/moon/src/dependencyobject.cpp
trunk/moon/src/dependencyobject.h
Log:
* dependencyobject.cpp (dependency_object_get_name): change this
to return the x:Name value if there is one (and "(null)" if not).
(dependency_object_get_type_name): and make this function do the
job originally done by _get_name.
* dependencyobject.h: add dependency_object_get_type_name
prototype.
2007-07-05 Chris Toshok <[EMAIL PROTECTED]>
Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog 2007-07-05 19:19:08 UTC (rev 81425)
+++ trunk/moon/src/ChangeLog 2007-07-05 19:20:27 UTC (rev 81426)
@@ -1,5 +1,15 @@
2007-07-05 Chris Toshok <[EMAIL PROTECTED]>
+ * dependencyobject.cpp (dependency_object_get_name): change this
+ to return the x:Name value if there is one (and "(null)" if not).
+ (dependency_object_get_type_name): and make this function do the
+ job originally done by _get_name.
+
+ * dependencyobject.h: add dependency_object_get_type_name
+ prototype.
+
+2007-07-05 Chris Toshok <[EMAIL PROTECTED]>
+
* uielement.h, uielement.cpp, canvas.h, canvas.cpp: refactor the
mouse event code so that the Handle* calls return void, like the
Enter/Leave calls do. Also, all checks for "inside"-ness happen
Modified: trunk/moon/src/dependencyobject.cpp
===================================================================
--- trunk/moon/src/dependencyobject.cpp 2007-07-05 19:19:08 UTC (rev 81425)
+++ trunk/moon/src/dependencyobject.cpp 2007-07-05 19:20:27 UTC (rev 81426)
@@ -388,7 +388,9 @@
const char *
dependency_object_get_name (DependencyObject *obj)
{
- return obj->GetTypeName ();
+ Value *v = obj->GetValue (DependencyObject::NameProperty);
+
+ return v ? (v->AsString () ? v->AsString() : "(null)") : "(null)";
}
Type::Kind
@@ -397,6 +399,12 @@
return obj->GetObjectType ();
}
+const char *
+dependency_object_get_type_name (DependencyObject *obj)
+{
+ return obj->GetTypeName ();
+}
+
void
dependency_object_add_event_handler (DependencyObject *o, char *event,
EventHandler handler, gpointer closure)
{
Modified: trunk/moon/src/dependencyobject.h
===================================================================
--- trunk/moon/src/dependencyobject.h 2007-07-05 19:19:08 UTC (rev 81425)
+++ trunk/moon/src/dependencyobject.h 2007-07-05 19:20:27 UTC (rev 81426)
@@ -163,6 +163,7 @@
const char *dependency_object_get_name (DependencyObject *obj);
Type::Kind dependency_object_get_object_type (DependencyObject *obj);
+const char *dependency_object_get_type_name (DependencyObject *obj);
void dependency_object_add_event_handler (DependencyObject *o, char *event,
EventHandler handler, gpointer closure);
void dependency_object_remove_event_handler (DependencyObject *o, char *event,
EventHandler handler, gpointer closure);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
