2005-10-13 Peter Dennis Bartok <[email protected]>

	* System.Windows.Forms.dll.resources: Added cursors
	* build-csproj: Updated to support resources
	* SWF.csproj: Updated
	* System.Windows.Forms.dll.sources: Removed blank line to support
	  build-csproj
	* System.Windows.Forms_test.dll.sources: Added ControlStyleTest


svn path=/trunk/mcs/; revision=51694

mcs/class/Managed.Windows.Forms/ChangeLog

@@ -1,3 +1,12 @@
+2005-10-13  Peter Dennis Bartok  <[email protected]>
+
+	* System.Windows.Forms.dll.resources: Added cursors
+	* build-csproj: Updated to support resources
+	* SWF.csproj: Updated
+	* System.Windows.Forms.dll.sources: Removed blank line to support
+	  build-csproj
+	* System.Windows.Forms_test.dll.sources: Added ControlStyleTest
+
 2005-10-05 Hisham Mardam Bey <[email protected]>
 
         * Created samples/ directory.	

mcs/class/Managed.Windows.Forms/SWF.csproj

@@ -2029,9 +2029,26 @@
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = ""
-                    SubType = "Code"
-                    BuildAction = "Compile"
+                    RelPath = "resources\System.Windows.Forms.resources"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "resources\System.Windows.Forms.en.resources"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "resources\System.Windows.Forms.de.resources"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "resources\SplitterNS.cur"
+                    CustomToolNameSpace = "System.Windows.Forms.SplitterNS.cur"
+                    BuildAction = "EmbeddedResource"
+                />
+                <File
+                    RelPath = "resources\SplitterWE.cur"
+                    CustomToolNameSpace = "System.Windows.Forms.SplitterWE.cur"
+                    BuildAction = "EmbeddedResource"
                 />
             </Include>
         </Files>

mcs/class/Managed.Windows.Forms/System.Windows.Forms.dll.resources

@@ -1,3 +1,5 @@
 -resource:resources/System.Windows.Forms.resources
 -resource:resources/System.Windows.Forms.en.resources
 -resource:resources/System.Windows.Forms.de.resources
+-resource:resources/SplitterNS.cur,System.Windows.Forms.SplitterNS.cur
+-resource:resources/SplitterWE.cur,System.Windows.Forms.SplitterWE.cur

mcs/class/Managed.Windows.Forms/System.Windows.Forms_test.dll.sources

@@ -7,6 +7,7 @@ System.Windows.Forms/ComboBoxTest.cs
 System.Windows.Forms/Common.cs
 System.Windows.Forms/ControlEventTest.cs
 System.Windows.Forms/ControlTest.cs
+System.Windows.Forms/ControlStyleTest.cs
 System.Windows.Forms/DataGridTableStyleTest.cs
 System.Windows.Forms/DataGridTest.cs
 System.Windows.Forms/DataGridTextBoxColumnTest.cs

mcs/class/Managed.Windows.Forms/build-csproj

@@ -8,6 +8,7 @@
 tr=tr
 OutFile=SWF.csproj
 Source=System.Windows.Forms.dll.sources
+Resource=System.Windows.Forms.dll.resources
 
 SWFhead()
 {
@@ -122,6 +123,24 @@ fi
 done
 }
 
+SWFresourcelist()
+{
+cat $Resource | while read SRC; do
+# Don't do AssemblyInfo, it's got signing requests and such that we don't want
+if [ "x$SRC" != "xAssembly/AssemblyInfo.cs" ] ; then
+SRC=`echo $SRC | $tr '/' '\\\\'`
+SRC=`echo $SRC | $tr '/' '\\\\' | sed 's/-resource://' | awk -F , '{print "                    RelPath = \"" $1 "\"\n                    CustomToolNameSpace = \"" $2 "\""}' | fgrep -v \"\"`
+
+cat << EOT
+                <File
+$SRC
+                    BuildAction = "EmbeddedResource"
+                />
+EOT
+fi
+done
+}
+
 SWFtail()
 {
 cat << EOT
@@ -134,5 +153,6 @@ EOT
 
 SWFhead > $OutFile
 SWFfilelist >> $OutFile
+SWFresourcelist >> $OutFile
 SWFtail >> $OutFile