[commit] r1807 - trunk/SDK/DecoratorLib
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Fri Jan 20 11:44:19 CST 2012
Author: ksmyth
Date: Fri Jan 20 11:44:19 2012
New Revision: 1807
Log:
Renames to avoid clashes
Added:
trunk/SDK/DecoratorLib/DecoratorLibResource.h
- copied, changed from r1806, trunk/SDK/DecoratorLib/resource.h
Deleted:
trunk/SDK/DecoratorLib/resource.h
Modified:
trunk/SDK/DecoratorLib/BitmapUtil.cpp
trunk/SDK/DecoratorLib/DecoratorDefs.h
trunk/SDK/DecoratorLib/DecoratorLib.rc
trunk/SDK/DecoratorLib/DecoratorLib.vcxproj
trunk/SDK/DecoratorLib/DecoratorLib.vcxproj.filters
trunk/SDK/DecoratorLib/ModelSwitchButtonPart.cpp
Modified: trunk/SDK/DecoratorLib/BitmapUtil.cpp
==============================================================================
--- trunk/SDK/DecoratorLib/BitmapUtil.cpp Wed Jan 18 13:01:22 2012 (r1806)
+++ trunk/SDK/DecoratorLib/BitmapUtil.cpp Fri Jan 20 11:44:19 2012 (r1807)
@@ -9,7 +9,7 @@
#include "BitmapUtil.h"
#include "DecoratorUtil.h"
-#include "resource.h"
+#include "DecoratorLibResource.h"
#include "DecoratorDefs.h"
#include <io.h>
Modified: trunk/SDK/DecoratorLib/DecoratorDefs.h
==============================================================================
--- trunk/SDK/DecoratorLib/DecoratorDefs.h Wed Jan 18 13:01:22 2012 (r1806)
+++ trunk/SDK/DecoratorLib/DecoratorDefs.h Fri Jan 20 11:44:19 2012 (r1807)
@@ -11,7 +11,7 @@
#pragma warning( disable : 4786 )
#include "StdAfx.h"
-#include "resource.h"
+#include "DecoratorLibResource.h"
//################################################################################################
Modified: trunk/SDK/DecoratorLib/DecoratorLib.rc
==============================================================================
--- trunk/SDK/DecoratorLib/DecoratorLib.rc Wed Jan 18 13:01:22 2012 (r1806)
+++ trunk/SDK/DecoratorLib/DecoratorLib.rc Fri Jan 20 11:44:19 2012 (r1807)
@@ -1,6 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "DecoratorLibResource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -21,15 +21,6 @@
#pragma code_page(1252)
#endif //_WIN32
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-1 ICON "DecoratorLib.ico"
-
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
@@ -38,7 +29,7 @@
1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "DecoratorLibResource.h\0"
"\0"
END
Modified: trunk/SDK/DecoratorLib/DecoratorLib.vcxproj
==============================================================================
--- trunk/SDK/DecoratorLib/DecoratorLib.vcxproj Wed Jan 18 13:01:22 2012 (r1806)
+++ trunk/SDK/DecoratorLib/DecoratorLib.vcxproj Fri Jan 20 11:44:19 2012 (r1807)
@@ -485,7 +485,7 @@
<ClInclude Include="ReferenceBitmapPart.h" />
<ClInclude Include="ResizablePart.h" />
<ClInclude Include="ResizeLogic.h" />
- <ClInclude Include="resource.h" />
+ <ClInclude Include="DecoratorLibResource.h" />
<ClInclude Include="SetBitmapPart.h" />
<ClInclude Include="SetSizeDialog.h" />
<ClInclude Include="SizeTrackerDialog.h" />
Modified: trunk/SDK/DecoratorLib/DecoratorLib.vcxproj.filters
==============================================================================
--- trunk/SDK/DecoratorLib/DecoratorLib.vcxproj.filters Wed Jan 18 13:01:22 2012 (r1806)
+++ trunk/SDK/DecoratorLib/DecoratorLib.vcxproj.filters Fri Jan 20 11:44:19 2012 (r1807)
@@ -293,9 +293,6 @@
<ClInclude Include="ResizeLogic.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="resource.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="SetBitmapPart.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -335,6 +332,9 @@
<ClInclude Include="GmeApi.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="DecoratorLibResource.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="res\atom.bmp">
Copied and modified: trunk/SDK/DecoratorLib/DecoratorLibResource.h (from r1806, trunk/SDK/DecoratorLib/resource.h)
==============================================================================
--- trunk/SDK/DecoratorLib/resource.h Wed Jan 18 13:01:22 2012 (r1806, copy source)
+++ trunk/SDK/DecoratorLib/DecoratorLibResource.h Fri Jan 20 11:44:19 2012 (r1807)
@@ -2,39 +2,39 @@
// Microsoft Visual C++ generated include file.
// Used by DecoratorLib.rc
//
-#define IDB_DEFAULTREFTONULL 159
-#define IDB_REFERENCE 159
-#define IDB_DEFAULTATOM 160
-#define IDB_ATOM 160
-#define IDB_DEFAULTSET 161
-#define IDB_SET 161
-#define IDB_DEFAULTNULLREF 166
-#define IDB_DEFAULTATOMPORT 173
-#define IDB_ATOMPORT 173
-#define IDB_DEFAULTREFPORT 174
-#define IDB_REFERENCEPORT 174
-#define IDB_DEFAULTSETPORT 175
-#define IDB_SETPORT 175
-#define IDB_DEFAULTMODELPORT 176
-#define IDB_MODELPORT 176
-#define IDB_ICON_TYPE 201
-#define IDB_ICON_SUBTYPE 202
-#define IDB_ICON_INSTANCE 203
-#define IDB_ICON_REFERENCE 204
-#define IDB_MODEL 205
-#define IDB_ICON_INSTANCE_DIS 206
-#define IDB_ICON_REFERENCE_DIS 207
-#define IDB_ICON_SUBTYPE_DIS 208
-#define IDB_ICON_TYPE_DIS 209
-#define IDB_REFERENCE_SIGN 210
-#define IDB_EXPAND_SIGN 212
-#define IDB_COLLAPSE_SIGN 213
+#define IDB_DEFAULTREFTONULL 2159
+#define IDB_REFERENCE 2159
+#define IDB_DEFAULTATOM 2160
+#define IDB_ATOM 2160
+#define IDB_DEFAULTSET 2161
+#define IDB_SET 2161
+#define IDB_DEFAULTNULLREF 2166
+#define IDB_DEFAULTATOMPORT 2173
+#define IDB_ATOMPORT 2173
+#define IDB_DEFAULTREFPORT 2174
+#define IDB_REFERENCEPORT 2174
+#define IDB_DEFAULTSETPORT 2175
+#define IDB_SETPORT 2175
+#define IDB_DEFAULTMODELPORT 2176
+#define IDB_MODELPORT 2176
+#define IDB_ICON_TYPE 2201
+#define IDB_ICON_SUBTYPE 2202
+#define IDB_ICON_INSTANCE 2203
+#define IDB_ICON_REFERENCE 2204
+#define IDB_MODEL 2205
+#define IDB_ICON_INSTANCE_DIS 2206
+#define IDB_ICON_REFERENCE_DIS 2207
+#define IDB_ICON_SUBTYPE_DIS 2208
+#define IDB_ICON_TYPE_DIS 2209
+#define IDB_REFERENCE_SIGN 2210
+#define IDB_EXPAND_SIGN 2212
+#define IDB_COLLAPSE_SIGN 2213
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 214
+#define _APS_NEXT_RESOURCE_VALUE 2214
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1000
#define _APS_NEXT_SYMED_VALUE 105
Modified: trunk/SDK/DecoratorLib/ModelSwitchButtonPart.cpp
==============================================================================
--- trunk/SDK/DecoratorLib/ModelSwitchButtonPart.cpp Wed Jan 18 13:01:22 2012 (r1806)
+++ trunk/SDK/DecoratorLib/ModelSwitchButtonPart.cpp Fri Jan 20 11:44:19 2012 (r1807)
@@ -8,7 +8,7 @@
#include "StdAfx.h"
#include "ModelSwitchButtonPart.h"
#include "DecoratorExceptions.h"
-#include "Resource.h"
+#include "DecoratorLibResource.h"
namespace DecoratorSDK {
More information about the gme-commit
mailing list