[EXPLORER]

* Add resource.h inclusion to the main header.
* Remove some unneeded inclusions.
CORE-7716

svn path=/trunk/; revision=61319

diff --git a/reactos/base/shell/explorer/desktop/desktop.cpp b/reactos/base/shell/explorer/desktop/desktop.cpp
index 94733c3..6bb12d2 100644 (file)
--- a/reactos/base/shell/explorer/desktop/desktop.cpp
+++ b/reactos/base/shell/explorer/desktop/desktop.cpp
@@ -28,8 +28,6 @@
 
 #include <precomp.h>
 
-#include "../resource.h"
-
 #include "../taskbar/desktopbar.h"
 #include "../taskbar/taskbar.h"        // for PM_GET_LAST_ACTIVE
 

diff --git a/reactos/base/shell/explorer/dialogs/searchprogram.cpp b/reactos/base/shell/explorer/dialogs/searchprogram.cpp
index f1f639b..0b49717 100644 (file)
--- a/reactos/base/shell/explorer/dialogs/searchprogram.cpp
+++ b/reactos/base/shell/explorer/dialogs/searchprogram.cpp
@@ -30,8 +30,6 @@
 
 #include <precomp.h>
 
-#include "../resource.h"
-
 #include "searchprogram.h"
 
 

diff --git a/reactos/base/shell/explorer/dialogs/settings.cpp b/reactos/base/shell/explorer/dialogs/settings.cpp
index 3e9c234..3e449b8 100644 (file)
--- a/reactos/base/shell/explorer/dialogs/settings.cpp
+++ b/reactos/base/shell/explorer/dialogs/settings.cpp
@@ -30,8 +30,6 @@
 
 #include <precomp.h>
 
-#include "../resource.h"
-
 #include "../taskbar/traynotify.h"
 #include "settings.h"
 

diff --git a/reactos/base/shell/explorer/explorer.cpp b/reactos/base/shell/explorer/explorer.cpp
index b3de9a9..be15d96 100644 (file)
--- a/reactos/base/shell/explorer/explorer.cpp
+++ b/reactos/base/shell/explorer/explorer.cpp
@@ -30,12 +30,8 @@
 
 #include <precomp.h>    // <precomp.h> instead of "precomp.h" because the ROS build system needs this to find the precompiled header file (*.gch) in the output directory tree
 
-#include "resource.h"
-
 #include <locale.h>    // for setlocale()
 
-#include <wincon.h>
-
 #ifndef __WINE__
 #include <io.h>        // for dup2()
 #include <fcntl.h>    // for _O_RDONLY

diff --git a/reactos/base/shell/explorer/precomp.h b/reactos/base/shell/explorer/precomp.h
index ccc73ff..0d05450 100644 (file)
--- a/reactos/base/shell/explorer/precomp.h
+++ b/reactos/base/shell/explorer/precomp.h
@@ -48,3 +48,5 @@
 
 #include "globals.h"
 #include "externals.h"
+
+#include "resource.h"

diff --git a/reactos/base/shell/explorer/shell/filechild.cpp b/reactos/base/shell/explorer/shell/filechild.cpp
index 2bb9af5..26c8adc 100644 (file)
--- a/reactos/base/shell/explorer/shell/filechild.cpp
+++ b/reactos/base/shell/explorer/shell/filechild.cpp
@@ -32,9 +32,6 @@
 #include "regfs.h"
 #include "fatfs.h"
 
-#include "../resource.h"
-
-
 FileChildWndInfo::FileChildWndInfo(HWND hmdiclient, LPCTSTR path, ENTRY_TYPE etype)
  :     super(hmdiclient),
        _etype(etype)

diff --git a/reactos/base/shell/explorer/shell/mainframe.cpp b/reactos/base/shell/explorer/shell/mainframe.cpp
index ecbaab3..748be6b 100644 (file)
--- a/reactos/base/shell/explorer/shell/mainframe.cpp
+++ b/reactos/base/shell/explorer/shell/mainframe.cpp
@@ -33,8 +33,6 @@
 */
 extern HWND create_webchildwindow(const WebChildWndInfo& info);
 
-#include "../resource.h"
-
 #include "../dialogs/settings.h"       // for MdiSdiDlg
 
 //#define _NO_REBAR

diff --git a/reactos/base/shell/explorer/shell/pane.cpp b/reactos/base/shell/explorer/shell/pane.cpp
index 0273fb6..6ce13b1 100644 (file)
--- a/reactos/base/shell/explorer/shell/pane.cpp
+++ b/reactos/base/shell/explorer/shell/pane.cpp
@@ -28,9 +28,6 @@
 
 #include <precomp.h>
 
-#include "../resource.h"
-
-
 enum IMAGE {
        IMG_NONE=-1,    IMG_FILE=0,             IMG_DOCUMENT,   IMG_EXECUTABLE,
        IMG_FOLDER,     IMG_OPEN_FOLDER,        IMG_FOLDER_PLUS,IMG_OPEN_PLUS,  IMG_OPEN_MINUS,

diff --git a/reactos/base/shell/explorer/shell/shellbrowser.cpp b/reactos/base/shell/explorer/shell/shellbrowser.cpp
index 50b95a3..3c8eccf 100644 (file)
--- a/reactos/base/shell/explorer/shell/shellbrowser.cpp
+++ b/reactos/base/shell/explorer/shell/shellbrowser.cpp
@@ -28,15 +28,11 @@
 
 #include <precomp.h>
 
-#include "../resource.h"
-
-
  // work around GCC's wide string constant bug
 #ifdef __GNUC__
 const LPCTSTR C_DRIVE = C_DRIVE_STR;
 #endif
 
-
 ShellBrowser::ShellBrowser(HWND hwnd, HWND hwndFrame, HWND left_hwnd, WindowHandle& right_hwnd, ShellPathInfo& create_info,
                                                        BrowserCallback* cb, CtxMenuInterfaces& cm_ifs)
  :     super(IID_IShellFolderViewCB),

diff --git a/reactos/base/shell/explorer/shell/shellfs.cpp b/reactos/base/shell/explorer/shell/shellfs.cpp
index 87ea0a1..d1115a2 100644 (file)
--- a/reactos/base/shell/explorer/shell/shellfs.cpp
+++ b/reactos/base/shell/explorer/shell/shellfs.cpp
@@ -28,12 +28,6 @@
 
 #include <precomp.h>
 
-//#include "shellfs.h"
-//#include "winfs.h"
-
-#include <shlwapi.h>
-
-
 bool ShellDirectory::fill_w32fdata_shell(LPCITEMIDLIST pidl, SFGAOF attribs, WIN32_FIND_DATA* pw32fdata, BY_HANDLE_FILE_INFORMATION* pbhfi, bool do_access)
 {
        CONTEXT("ShellDirectory::fill_w32fdata_shell()");

diff --git a/reactos/base/shell/explorer/shell/webchild.cpp b/reactos/base/shell/explorer/shell/webchild.cpp
index 446c344..22d6d0f 100644 (file)
--- a/reactos/base/shell/explorer/shell/webchild.cpp
+++ b/reactos/base/shell/explorer/shell/webchild.cpp
@@ -25,19 +25,12 @@
  // Martin Fuchs, 08.02.2004
  //
 
-
 #include <precomp.h>
 
-#include "../resource.h"
-
 #include "webchild.h"
 
-
 #include <comutil.h>
 
-//#include <mshtml.h>
-
-
 Variant::Variant(const VARIANT& var)
 {
        VariantInit(this);

diff --git a/reactos/base/shell/explorer/taskbar/desktopbar.cpp b/reactos/base/shell/explorer/taskbar/desktopbar.cpp
index c740ee9..4353b06 100644 (file)
--- a/reactos/base/shell/explorer/taskbar/desktopbar.cpp
+++ b/reactos/base/shell/explorer/taskbar/desktopbar.cpp
@@ -28,8 +28,6 @@
 
 #include <precomp.h>
 
-#include "../resource.h"
-
 #include "desktopbar.h"
 #include "taskbar.h"
 #include "startmenu.h"

diff --git a/reactos/base/shell/explorer/taskbar/quicklaunch.cpp b/reactos/base/shell/explorer/taskbar/quicklaunch.cpp
index ce9ab23..015dbd5 100644 (file)
--- a/reactos/base/shell/explorer/taskbar/quicklaunch.cpp
+++ b/reactos/base/shell/explorer/taskbar/quicklaunch.cpp
@@ -28,8 +28,6 @@
 
 #include <precomp.h>
 
-#include "../resource.h"
-
 #include "quicklaunch.h"
 
 

diff --git a/reactos/base/shell/explorer/taskbar/startmenu.cpp b/reactos/base/shell/explorer/taskbar/startmenu.cpp
index 56f51c4..b119720 100644 (file)
--- a/reactos/base/shell/explorer/taskbar/startmenu.cpp
+++ b/reactos/base/shell/explorer/taskbar/startmenu.cpp
@@ -32,8 +32,6 @@
 
 #include <precomp.h>
 
-#include "../resource.h"
-
 #include "desktopbar.h"
 #include "startmenu.h"
 

diff --git a/reactos/base/shell/explorer/taskbar/traynotify.cpp b/reactos/base/shell/explorer/taskbar/traynotify.cpp
index 7e2690a..802dcbc 100644 (file)
--- a/reactos/base/shell/explorer/taskbar/traynotify.cpp
+++ b/reactos/base/shell/explorer/taskbar/traynotify.cpp
@@ -28,11 +28,8 @@
 
 #include <precomp.h>
 
-#include "../resource.h"
-
 #include "traynotify.h"
 
-
 #include "../notifyhook/notifyhook.h"
 
 NotifyHook::NotifyHook()

diff --git a/reactos/base/shell/explorer/utility/window.cpp b/reactos/base/shell/explorer/utility/window.cpp
index bb0814d..d3cc80d 100644 (file)
--- a/reactos/base/shell/explorer/utility/window.cpp
+++ b/reactos/base/shell/explorer/utility/window.cpp
@@ -28,9 +28,6 @@
 
 #include <precomp.h>
 
-#include "../resource.h"       // for ID_GO_BACK, ...
-
-
 WindowClass::WindowClass(LPCTSTR classname, UINT style_, WNDPROC wndproc)
 {
        memset(this, 0, sizeof(WNDCLASSEX));