[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mono-patches
Subject:    [Mono-patches] r109390 - trunk/moon/src
From:       "Jeff Stedfast" <mono-patches-list () lists ! ximian ! com>
Date:       2008-07-31 20:44:47
Message-ID: 20080731204447.8D09E9472C () mono-cvs ! ximian ! com
[Download RAW message or body]

Author: fejj
Date: 2008-07-31 16:44:47 -0400 (Thu, 31 Jul 2008)
New Revision: 109390

Modified:
   trunk/moon/src/Makefile.am
   trunk/moon/src/contentcontrol.h
   trunk/moon/src/control.h
   trunk/moon/src/type-generated.cpp
   trunk/moon/src/type.h
Log:
added SilverlightVersion=2 attribute to Control and ContentControl classes

Modified: trunk/moon/src/Makefile.am
===================================================================
--- trunk/moon/src/Makefile.am	2008-07-31 20:41:44 UTC (rev 109389)
+++ trunk/moon/src/Makefile.am	2008-07-31 20:44:47 UTC (rev 109390)
@@ -139,12 +139,16 @@
 
 if INCLUDE_MONO_RUNTIME
 libmoon_include_HEADERS += 	\
+	contentcontrol.h	\
+	control.h		\
 	deployment.h		\
 	grid.h			\
 	usercontrol.h		\
 	xap.h
 
 libmoon_la_SOURCES += 		\
+	contentcontrol.cpp	\
+	control.cpp		\
 	deployment.cpp		\
 	grid.cpp		\
 	usercontrol.cpp 	\

Modified: trunk/moon/src/contentcontrol.h
===================================================================
--- trunk/moon/src/contentcontrol.h	2008-07-31 20:41:44 UTC (rev 109389)
+++ trunk/moon/src/contentcontrol.h	2008-07-31 20:44:47 UTC (rev 109390)
@@ -21,6 +21,7 @@
 // ContentControl Class
 //
 /* @ContentProperty="Content" */
+/* @SilverlightVersion="2" */
 class ContentControl : public Control {
  protected:
 	virtual ~ContentControl () {}

Modified: trunk/moon/src/control.h
===================================================================
--- trunk/moon/src/control.h	2008-07-31 20:41:44 UTC (rev 109389)
+++ trunk/moon/src/control.h	2008-07-31 20:44:47 UTC (rev 109390)
@@ -63,6 +63,7 @@
 // Control Class
 //
 /* @ContentProperty="Content" */
+/* @SilverlightVersion="2" */
 class Control : public FrameworkElement {
 	bool emitting_loaded;
 	

Modified: trunk/moon/src/type-generated.cpp
===================================================================
--- trunk/moon/src/type-generated.cpp	2008-07-31 20:41:44 UTC (rev 109389)
+++ trunk/moon/src/type-generated.cpp	2008-07-31 20:44:47 UTC (rev 109390)
@@ -10,8 +10,6 @@
 #include "brush.h"
 #include "canvas.h"
 #include "collection.h"
-#include "contentcontrol.h"
-#include "control.h"
 #include "array.h"
 #include "downloader.h"
 #include "stylus.h"
@@ -31,6 +29,8 @@
 #if SL_2_0
 #include "deployment.h"
 #include "grid.h"
+#include "contentcontrol.h"
+#include "control.h"
 #include "usercontrol.h"
 #endif
 
@@ -128,8 +128,16 @@
 #else
 	{ Type::INVALID, Type::INVALID, false, "2.0 specific type \
'COLUMNDEFINITION_COLLECTION'", "COLUMNDEFINITION_COLLECTION", 0, 0, NULL, NULL, \
NULL, NULL },   #endif
+#if SL_2_0
 	{ Type::CONTENTCONTROL, Type::CONTROL, false, "ContentControl", "CONTENTCONTROL", \
0, 12, NULL, (create_inst_func *) content_control_new, "Content", NULL },  +#else
+	{ Type::INVALID, Type::INVALID, false, "2.0 specific type 'CONTENTCONTROL'", \
"CONTENTCONTROL", 0, 0, NULL, NULL, NULL, NULL },  +#endif
+#if SL_2_0
 	{ Type::CONTROL, Type::FRAMEWORKELEMENT, false, "Control", "CONTROL", 0, 12, NULL, \
(create_inst_func *) control_new, "Content", NULL },  +#else
+	{ Type::INVALID, Type::INVALID, false, "2.0 specific type 'CONTROL'", "CONTROL", 0, \
0, NULL, NULL, NULL, NULL },  +#endif
 	{ Type::DEPENDENCY_OBJECT, Type::EVENTOBJECT, false, "DependencyObject", \
"DEPENDENCY_OBJECT", 0, 1, NULL, NULL, NULL, NULL },   { \
Type::DEPENDENCY_OBJECT_COLLECTION, Type::COLLECTION, false, \
"DependencyObjectCollection", "DEPENDENCY_OBJECT_COLLECTION", 0, 1, NULL, \
(create_inst_func *) dependency_object_collection_new, NULL, NULL },   #if SL_2_0

Modified: trunk/moon/src/type.h
===================================================================
--- trunk/moon/src/type.h	2008-07-31 20:41:44 UTC (rev 109389)
+++ trunk/moon/src/type.h	2008-07-31 20:44:47 UTC (rev 109390)
@@ -50,8 +50,8 @@
 		COLORKEYFRAME_COLLECTION,
 		COLUMNDEFINITION,// Silverlight 2.0 only
 		COLUMNDEFINITION_COLLECTION,// Silverlight 2.0 only
-		CONTENTCONTROL,
-		CONTROL,
+		CONTENTCONTROL,// Silverlight 2.0 only
+		CONTROL,// Silverlight 2.0 only
 		DEPENDENCY_OBJECT,
 		DEPENDENCY_OBJECT_COLLECTION,
 		DEPLOYMENT,// Silverlight 2.0 only

_______________________________________________
Mono-patches maillist  -  Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches


[prev in list] [next in list] [prev in thread] [next in thread]