From 5e976e5badd45207426be7f860006f5d9abfd53e Mon Sep 17 00:00:00 2001
From: Martin Fuchs <fuchs.martin@gmail.com>
Date: Mon, 3 Jan 2005 11:25:40 +0000
Subject: [PATCH] update Explorer Jamfile

svn path=/trunk/; revision=12752
---
 reactos/subsys/system/explorer/Jamfile        |  2 +-
 reactos/subsys/system/explorer/explorer.dsw   |  3 ++
 reactos/subsys/system/explorer/explorer.rc    |  2 +-
 .../system/explorer/notifyhook/notifyhook.rc  |  2 +-
 reactos/subsys/system/explorer/rc-mingw.jam   |  4 +--
 .../system/explorer/utility/xmlstorage.h      | 34 +++++++++----------
 6 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/reactos/subsys/system/explorer/Jamfile b/reactos/subsys/system/explorer/Jamfile
index 640bd6f75f3..e0720405d48 100644
--- a/reactos/subsys/system/explorer/Jamfile
+++ b/reactos/subsys/system/explorer/Jamfile
@@ -44,7 +44,7 @@ exe explorer :
 	dialogs/settings.cpp
 	i386-stub-win32.c
  :	<define>WIN32 <define>_WIN32_IE=0x0600 <define>_WIN32_WINNT=0x0501 <define>WINVER=0x0500
-	<cxxflags>-I$(INCLUDE)
+	<cxxflags>-I$(INCLUDE) <cxxflags>-I.
 #nur für GCC:	<cxxflags>-fexceptions <cxxflags>-Wall
 	<find-shared-library>gdi32
 	<find-shared-library>ole32
diff --git a/reactos/subsys/system/explorer/explorer.dsw b/reactos/subsys/system/explorer/explorer.dsw
index 51e9b3bd73e..4eb2c8a2211 100644
--- a/reactos/subsys/system/explorer/explorer.dsw
+++ b/reactos/subsys/system/explorer/explorer.dsw
@@ -11,6 +11,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name notifyhook
+    End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/reactos/subsys/system/explorer/explorer.rc b/reactos/subsys/system/explorer/explorer.rc
index 1abc1e53096..9f6da6e62c1 100644
--- a/reactos/subsys/system/explorer/explorer.rc
+++ b/reactos/subsys/system/explorer/explorer.rc
@@ -1,4 +1,4 @@
-/* $Id: explorer.rc,v 1.6 2004/10/16 20:27:41 gvg Exp $ */
+/* $Id$ */
 
 #include <defines.h>
 
diff --git a/reactos/subsys/system/explorer/notifyhook/notifyhook.rc b/reactos/subsys/system/explorer/notifyhook/notifyhook.rc
index 89a1ab13c06..096ed22d9fb 100644
--- a/reactos/subsys/system/explorer/notifyhook/notifyhook.rc
+++ b/reactos/subsys/system/explorer/notifyhook/notifyhook.rc
@@ -1,4 +1,4 @@
-/* $Id: notifyhook.rc,v 1.2 2004/10/16 20:27:41 gvg Exp $ */
+/* $Id$ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"NotifyHook DLL for ROS Explorer\0"
diff --git a/reactos/subsys/system/explorer/rc-mingw.jam b/reactos/subsys/system/explorer/rc-mingw.jam
index 9f456560f6f..62f8f96bc58 100644
--- a/reactos/subsys/system/explorer/rc-mingw.jam
+++ b/reactos/subsys/system/explorer/rc-mingw.jam
@@ -33,12 +33,12 @@ actions quietly resource-compile-nt
 
 actions quietly resource-compile-mingw
 {
-    windres -o "$(<)" -i "$(>)"
+    windres -D__WINDRES__ -o "$(<)" -i "$(>)"
 }
 
 actions quietly resource-compile-cygwin
 {
-    windres --include-dir "$(>:D)" -o "$(<)" -i "$(>)"
+    windres -D__WINDRES__ --include-dir "$(>:D)" -o "$(<)" -i "$(>)"
 }
 
 actions quietly create-empty-object
diff --git a/reactos/subsys/system/explorer/utility/xmlstorage.h b/reactos/subsys/system/explorer/utility/xmlstorage.h
index fdf862ee5fc..60b5fab1daf 100644
--- a/reactos/subsys/system/explorer/utility/xmlstorage.h
+++ b/reactos/subsys/system/explorer/utility/xmlstorage.h
@@ -612,23 +612,6 @@ struct XMLNode : public XS_String
 		return out;
 	}
 
-protected:
-	Children _children;
-	AttributeMap _attributes;
-
-	std::string _leading;
-	std::string _content;
-	std::string _end_leading;
-	std::string _trailing;
-
-	XMLNode* get_first_child() const
-	{
-		if (!_children.empty())
-			return _children.front();
-		else
-			return NULL;
-	}
-
 	XMLNode* find(const XS_String& name, int n=0) const
 	{
 		for(Children::const_iterator it=_children.begin(); it!=_children.end(); ++it)
@@ -687,6 +670,23 @@ protected:
 	 /// relative XPath create function
 	XMLNode* create_relative(const char* path);
 
+protected:
+	Children _children;
+	AttributeMap _attributes;
+
+	std::string _leading;
+	std::string _content;
+	std::string _end_leading;
+	std::string _trailing;
+
+	XMLNode* get_first_child() const
+	{
+		if (!_children.empty())
+			return _children.front();
+		else
+			return NULL;
+	}
+
 	void write_worker(std::ostream& out, int indent) const;
 	void pretty_write_worker(std::ostream& out, int indent) const;
 	void smart_write_worker(std::ostream& out, int indent) const;