merge ROS Shell without integrated explorer part into trunk

[reactos.git] / reactos / subsys / system / explorer / explorer_intres.rc

diff --git a/reactos/subsys/system/explorer/explorer_intres.rc b/reactos/subsys/system/explorer/explorer_intres.rc
index b70c454..6f319a8 100644 (file)
--- a/reactos/subsys/system/explorer/explorer_intres.rc
+++ b/reactos/subsys/system/explorer/explorer_intres.rc
@@ -197,8 +197,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 // Bitmap
 //
 
 // Bitmap
 //
 

-IDB_IMAGES              BITMAP  DISCARDABLE     "res/images.bmp"
-IDB_TOOLBAR             BITMAP  DISCARDABLE     "res/toolbar.bmp"

 IDB_DRIVEBAR            BITMAP  DISCARDABLE     "res/drivebar.bmp"
 IDB_LOGOV               BITMAP  DISCARDABLE     "res/logov.bmp"
 IDB_LOGOV256            BITMAP  DISCARDABLE     "res/logov256.bmp"
 IDB_DRIVEBAR            BITMAP  DISCARDABLE     "res/drivebar.bmp"
 IDB_LOGOV               BITMAP  DISCARDABLE     "res/logov.bmp"
 IDB_LOGOV256            BITMAP  DISCARDABLE     "res/logov256.bmp"


@@ -494,6 +492,10 @@ END
 
 3 TEXTINCLUDE DISCARDABLE 
 BEGIN
 
 3 TEXTINCLUDE DISCARDABLE 
 BEGIN

+    "#ifndef ROSSHELL\r\n"
+    "IDB_IMAGES                BITMAP DISCARDABLE ""res/images.bmp""\r\n"
+    "IDB_TOOLBAR       BITMAP DISCARDABLE ""res/toolbar.bmp""\r\n"
+    "#endif\r\n"

     "#ifndef _ROS_\r\n"
     "LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL\r\n"
     "STRINGTABLE DISCARDABLE \r\n"
     "#ifndef _ROS_\r\n"
     "LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL\r\n"
     "STRINGTABLE DISCARDABLE \r\n"