[commit] r1808 - in trunk: Install SDK/DecoratorLib SDK/DecoratorWizard/Scripts/1033

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Jan 20 13:40:08 2012
New Revision: 1808

Log:
Include DecoratorLib.rc in generated decorators

Modified:
   trunk/Install/GME_SDK.wxs
   trunk/SDK/DecoratorLib/DecoratorUtil.cpp
   trunk/SDK/DecoratorWizard/Scripts/1033/default.js

Modified: trunk/Install/GME_SDK.wxs
==============================================================================
--- trunk/Install/GME_SDK.wxs	Fri Jan 20 11:44:19 2012	(r1807)
+++ trunk/Install/GME_SDK.wxs	Fri Jan 20 13:40:08 2012	(r1808)
@@ -1128,7 +1128,7 @@
         <File Id="ResizablePart.h" Name="ResizablePart.h"  Source="..\SDK\DecoratorLib\ResizablePart.h" />
         <File Id="ResizeLogic.cpp" Name="ResizeLogic.cpp"  Source="..\SDK\DecoratorLib\ResizeLogic.cpp" />
         <File Id="ResizeLogic.h" Name="ResizeLogic.h"  Source="..\SDK\DecoratorLib\ResizeLogic.h" />
-        <File Id="resource.h" Name="resource.h"  Source="..\SDK\DecoratorLib\resource.h" />
+        <File Id="DecoratorLibResource.h" Name="DecoratorLibResource.h"  Source="..\SDK\DecoratorLib\DecoratorLibResource.h" />
         <File Id="SetBitmapPart.cpp" Name="SetBitmapPart.cpp"  Source="..\SDK\DecoratorLib\SetBitmapPart.cpp" />
         <File Id="SetBitmapPart.h" Name="SetBitmapPart.h"  Source="..\SDK\DecoratorLib\SetBitmapPart.h" />
         <File Id="DecoratorLib_Stdafx.cpp" Name="Stdafx.cpp"  Source="..\SDK\DecoratorLib\Stdafx.cpp" />
@@ -1186,7 +1186,6 @@
         <File Id="Decorator.vsz" Name="Decorator.vsz"  Source="..\SDK\DecoratorWizard\Decorator.vsz" />
         <File Id="DecoratorWizard.vsdir" Name="DecoratorWizard.vsdir" KeyPath="yes" Source="..\SDK\DecoratorWizard\DecoratorWizard.vsdir" />
         <File Id="DecoratorWizard_default.vcproj" Name="default.vcproj"  Source="..\SDK\DecoratorWizard\default.vcproj" />
-        <File Id="DecoratorWizard_setup90.js" Name="setup90.js"  Source="..\SDK\DecoratorWizard\setup90.js" />
         <File Id="DecoratorWizard_setup100.js" Name="setup100.js"  Source="..\SDK\DecoratorWizard\setup100.js" />
       </Component>
     </DirectoryRef>

Modified: trunk/SDK/DecoratorLib/DecoratorUtil.cpp
==============================================================================
--- trunk/SDK/DecoratorLib/DecoratorUtil.cpp	Fri Jan 20 11:44:19 2012	(r1807)
+++ trunk/SDK/DecoratorLib/DecoratorUtil.cpp	Fri Jan 20 13:40:08 2012	(r1808)
@@ -991,6 +991,10 @@
 	} else if (bRoundRect && iCornerRadius > 0) {
 		long diameter = 2 * iCornerRadius;
 		Gdiplus::GraphicsPath buttonPath;
+		CRect tmpRect = cRect;
+		CRect cRect = tmpRect;
+		cRect.right -= 1;
+		cRect.top -= 1;
 		buttonPath.AddArc(cRect.left, cRect.top, diameter, diameter, 180.0, 90.0);
 		buttonPath.AddLine(cRect.left + iCornerRadius, cRect.top, cRect.right - iCornerRadius, cRect.top);
 		buttonPath.AddArc(cRect.right - diameter, cRect.top, diameter, diameter, 270.0, 90.0);

Modified: trunk/SDK/DecoratorWizard/Scripts/1033/default.js
==============================================================================
--- trunk/SDK/DecoratorWizard/Scripts/1033/default.js	Fri Jan 20 11:44:19 2012	(r1807)
+++ trunk/SDK/DecoratorWizard/Scripts/1033/default.js	Fri Jan 20 13:40:08 2012	(r1808)
@@ -33,6 +33,7 @@
 
 		var InfFile = CreateCustomInfFile();
 		AddFilesToCustomProj(selProj, strProjectName, strProjectPath, InfFile);
+		AddDecoratorLibRc(selProj);
 		PchSettings(selProj);
 		InfFile.Delete();
 
@@ -59,6 +60,7 @@
 
 		var InfFile = CreateCustomInfFile();
 		AddFilesToCustomProj(selProj, strProjectName, strProjectPath, InfFile);
+		AddDecoratorLibRc(selProj);
 		PchSettings(selProj);
 		InfFile.Delete();
 
@@ -72,6 +74,17 @@
 	}
 }
 
+function AddDecoratorLibRc(proj)
+{
+	var strFile = '$(GME_ROOT)\\SDK\\DecoratorLib\\DecoratorLib.rc';
+	vcfile = proj.Object.AddFile(strFile);
+
+	if (dte.Version != '10.0') {
+	    // This is needed to remove the '.' from the beginning of the relative path (added by default)
+	    vcfile.RelativePath = strFile;
+	}
+}
+
 function CreateCustomProject90(strProjectName, strProjectPath)
 {
 	try