[commit] r1824 - trunk/GME/MgaDecorators

[GMESRC Repository Notifications]

Author: ksmyth
Date: Mon Feb  6 17:28:19 2012
New Revision: 1824

Log:
Use icons from DecoratorLib.rc

Modified:
   trunk/GME/MgaDecorators/MgaDecorators.rc
   trunk/GME/MgaDecorators/MgaDecorators.vcxproj
   trunk/GME/MgaDecorators/MgaDecorators.vcxproj.filters
   trunk/GME/MgaDecorators/Resource.h

Modified: trunk/GME/MgaDecorators/MgaDecorators.rc
==============================================================================
--- trunk/GME/MgaDecorators/MgaDecorators.rc	Mon Feb  6 17:28:05 2012	(r1823)
+++ trunk/GME/MgaDecorators/MgaDecorators.rc	Mon Feb  6 17:28:19 2012	(r1824)
@@ -97,25 +97,6 @@
 // Bitmap
 //
 
-IDB_ATOM                BITMAP                  "res\\atom.bmp"
-IDB_ATOMPORT            BITMAP                  "res\\atomport.bmp"
-IDB_REFERENCEPORT       BITMAP                  "res\\referenceport.bmp"
-IDB_SETPORT             BITMAP                  "res\\setport.bmp"
-IDB_REFERENCE           BITMAP                  "res\\reference.bmp"
-IDB_SET                 BITMAP                  "res\\set.bmp"
-IDB_MODELPORT           BITMAP                  "res\\modelport.bmp"
-IDB_ICON_TYPE           BITMAP                  "res\\icon_type.bmp"
-IDB_ICON_SUBTYPE        BITMAP                  "res\\icon_subtype.bmp"
-IDB_ICON_INSTANCE       BITMAP                  "res\\icon_instance.bmp"
-IDB_ICON_REFERENCE      BITMAP                  "res\\icon_reference.bmp"
-IDB_MODEL               BITMAP                  "res\\model.bmp"
-IDB_ICON_INSTANCE_DIS   BITMAP                  "res\\icon_instance_disabled.bmp"
-IDB_ICON_REFERENCE_DIS  BITMAP                  "res\\icon_reference_disabled.bmp"
-IDB_ICON_SUBTYPE_DIS    BITMAP                  "res\\icon_subtype_disabled.bmp"
-IDB_ICON_TYPE_DIS       BITMAP                  "res\\icon_type_disabled.bmp"
-IDB_EXPAND_SIGN         BITMAP                  "res\\expandsign.bmp"
-IDB_COLLAPSE_SIGN       BITMAP                  "res\\collapsesign.bmp"
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // String Table

Modified: trunk/GME/MgaDecorators/MgaDecorators.vcxproj
==============================================================================
--- trunk/GME/MgaDecorators/MgaDecorators.vcxproj	Mon Feb  6 17:28:05 2012	(r1823)
+++ trunk/GME/MgaDecorators/MgaDecorators.vcxproj	Mon Feb  6 17:28:19 2012	(r1824)
@@ -270,6 +270,7 @@
     <None Include="res\setport.bmp" />
   </ItemGroup>
   <ItemGroup>
+    <ResourceCompile Include="..\..\SDK\DecoratorLib\DecoratorLib.rc" />
     <ResourceCompile Include="MgaDecorators.rc">
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

Modified: trunk/GME/MgaDecorators/MgaDecorators.vcxproj.filters
==============================================================================
--- trunk/GME/MgaDecorators/MgaDecorators.vcxproj.filters	Mon Feb  6 17:28:05 2012	(r1823)
+++ trunk/GME/MgaDecorators/MgaDecorators.vcxproj.filters	Mon Feb  6 17:28:19 2012	(r1824)
@@ -99,6 +99,9 @@
     <ResourceCompile Include="MgaDecorators.rc">
       <Filter>Source Files</Filter>
     </ResourceCompile>
+    <ResourceCompile Include="..\..\SDK\DecoratorLib\DecoratorLib.rc">
+      <Filter>Source Files</Filter>
+    </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="BoxDecorator.h">

Modified: trunk/GME/MgaDecorators/Resource.h
==============================================================================
--- trunk/GME/MgaDecorators/Resource.h	Mon Feb  6 17:28:05 2012	(r1823)
+++ trunk/GME/MgaDecorators/Resource.h	Mon Feb  6 17:28:19 2012	(r1824)
@@ -4,32 +4,6 @@
 //
 #define IDS_PROJNAME                    100
 #define IDR_BOXDECORATOR                101
-#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_EXPAND_SIGN                 212
-#define IDB_COLLAPSE_SIGN               213
 
 // Next default values for new objects
 //