merge ROS Shell without integrated explorer part into trunk

[reactos.git] / reactos / subsys / system / explorer / globals.h

diff --git a/reactos/subsys/system/explorer/globals.h b/reactos/subsys/system/explorer/globals.h
index e0d65ed..e28a9c3 100644 (file)
--- a/reactos/subsys/system/explorer/globals.h
+++ b/reactos/subsys/system/explorer/globals.h
@@ -236,14 +236,17 @@ extern struct ExplorerGlobals
        void    write_persistent();
 
        XMLPos  get_cfg();
-       XMLPos  get_cfg(const String& name);
+       XMLPos  get_cfg(const char* path);
 
        HINSTANCE       _hInstance;
-       ATOM            _hframeClass;
        UINT            _cfStrFName;
+
+#ifndef ROSSHELL
+       ATOM            _hframeClass;
        HWND            _hMainWnd;
-       bool            _prescan_nodes;
        bool            _desktop_mode;
+       bool            _prescan_nodes;
+#endif
 
        FILE*           _log;