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 5cc9371..e28a9c3 100644 (file)
--- a/reactos/subsys/system/explorer/globals.h
+++ b/reactos/subsys/system/explorer/globals.h
@@ -239,11 +239,14 @@ extern struct ExplorerGlobals
        XMLPos  get_cfg(const char* path);
 
        HINSTANCE       _hInstance;
        XMLPos  get_cfg(const char* path);
 
        HINSTANCE       _hInstance;

-       ATOM            _hframeClass;

        UINT            _cfStrFName;
        UINT            _cfStrFName;

+
+#ifndef ROSSHELL
+       ATOM            _hframeClass;

        HWND            _hMainWnd;
        HWND            _hMainWnd;

-       bool            _prescan_nodes;

        bool            _desktop_mode;
        bool            _desktop_mode;

+       bool            _prescan_nodes;
+#endif

 
        FILE*           _log;
 
 
        FILE*           _log;