[mf] 14959: rosshell: printer and network folder in start menu

rosshell: printer and network folder in start menu
Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc
Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp
  _____  

Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc
--- trunk/reactos/subsys/system/explorer/explorer_intres.rc
2005-05-03 11:56:46 UTC (rev 14958)
+++ trunk/reactos/subsys/system/explorer/explorer_intres.rc
2005-05-03 12:15:27 UTC (rev 14959)
@@ -447,7 +447,7 @@

 BEGIN
     LTEXT           "ReactOS Explorer",IDC_ROS_EXPLORER,91,13,104,11
     LTEXT           "V 0.9",IDC_VERSION_TXT,91,27,104,8
-    LTEXT           "(c) 2003/2004 Martin Fuchs",IDC_STATIC,91,42,104,8
+    LTEXT           "(c) 2003-2005 Martin Fuchs",IDC_STATIC,91,42,104,8
     LTEXT           "",IDC_WIN_VERSION,91,58,98,22
     LTEXT
"http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129,
                     8
  _____  

Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp
--- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp
2005-05-03 11:56:46 UTC (rev 14958)
+++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp
2005-05-03 12:15:27 UTC (rev 14959)
@@ -2083,7 +2083,7 @@

 {
 	super::AddEntries();
 
-#ifdef _ROS_	// to be removed when printer/network will be
implemented
+#if defined(ROSSHELL) || defined(_ROS_)	// _ROS_ to be removed
when printer/network will be implemented
 	AddButton(ResString(IDS_PRINTERS),
ICID_PRINTER, false, IDC_PRINTERS_MENU);
 	AddButton(ResString(IDS_CONNECTIONS),		ICID_NETWORK,
false, IDC_CONNECTIONS);
 #else
@@ -2114,7 +2114,7 @@
 #ifndef __MINGW32__	// SHRestricted() missing in MinGW (as of
29.10.2003)
 	if (!g_Globals._SHRestricted || !SHRestricted(REST_NONETHOOD))
// or REST_NOENTIRENETWORK ?
 #endif
-#ifdef _ROS_	// to be removed when printer/network will be
implemented
+#if defined(ROSSHELL) || defined(_ROS_)	// _ROS_ to be removed
when printer/network will be implemented
 		AddButton(ResString(IDS_NETWORK),
ICID_NETWORK, false, IDC_NETWORK);
 #else
 		AddButton(ResString(IDS_NETWORK),
ICID_NETWORK, true, IDC_NETWORK);