CHANGED: #1471 GUI library will now build with the new externals and Visual Studio 2010.

code/nel/include/nel/gui/group_html.h

@@ -31,7 +31,7 @@ typedef std::map<std::string, std::string>	TStyle;
 
 extern "C"
 {
-#include "WWWInit.h"
+#include "libwww/WWWInit.h"
 }
 
 namespace NLGUI

code/nel/include/nel/gui/libwww.h

@@ -22,7 +22,7 @@
 
 extern "C"
 {
-#include "WWWInit.h"
+#include "libwww/WWWInit.h"
 }
 
 namespace NLGUI

code/nel/include/nel/gui/libwww_nel_stream.h

@@ -20,7 +20,7 @@
 #define LIBWWW_NEL_STREAM_H
 
 
-#include "HTProt.h"
+#include "libwww/HTProt.h"
 
 extern "C" HTProtCallback HTLoadNeLFile;
 extern "C" PUBLIC HTInputStream * HTNeLReader_new (HTHost * host, HTChannel * ch, void * param, int mode);

code/nel/include/nel/gui/lua_loadlib.h

@@ -19,9 +19,9 @@
 
 extern "C"
 {
-#include <lua.h>
+#include <lua/lua.h>
-#include <lauxlib.h>
+#include <lua/lauxlib.h>
-#include <lualib.h>
+#include <lua/lualib.h>
 }
 
 // load the lua dll, return 1 on success

code/nel/include/nel/gui/proc.h

@@ -22,6 +22,7 @@
 #include <string>
 #include <vector>
 #include <map>
+#include <algorithm>
 
 namespace NLGUI
 {

code/nel/src/gui/ctrl_base.cpp

@@ -468,7 +468,7 @@ namespace NLGUI
 		AHMap[ key ] = value;
 	}
 
-	std::string CCtrlBase::getAHString( const stlpx_std::string &key ) const
+	std::string CCtrlBase::getAHString( const std::string &key ) const
 	{
 		std::map< std::string, std::map< std::string, std::string > >::const_iterator itr = AHCache.find( getId() );
 		if( itr == AHCache.end() )

code/nel/src/gui/group_editbox.cpp

@@ -100,7 +100,7 @@ namespace NLGUI
 		}
 	}
 
-	std::string CGroupEditBox::getProperty( const stlpx_std::string &name ) const
+	std::string CGroupEditBox::getProperty( const std::string &name ) const
 	{
 		if( name == "onchange" )
 		{

code/nel/src/gui/group_html.cpp

@@ -18,12 +18,14 @@
 
 #define NOMINMAX
 
+#include "nel/gui/group_html.h"
+
 // LibWWW
 extern "C"
 {
-#include "WWWLib.h"			      /* Global Library Include file */
+#include "libwww/WWWLib.h"			      /* Global Library Include file */
-#include "WWWApp.h"
+#include "libwww/WWWApp.h"
-#include "WWWInit.h"
+#include "libwww/WWWInit.h"
 }
 
 #include <string>

code/nel/src/gui/interface_link.cpp

@@ -26,6 +26,8 @@
 #include "nel/gui/widget_manager.h"
 #include "nel/misc/algo.h"
 
+#include <iterator>
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/gui/libwww.cpp

@@ -16,12 +16,14 @@
 
 #define NOMINMAX
 
+#include "nel/gui/group_html.h"
+
 // LibWWW
 extern "C"
 {
-#include "WWWLib.h"			      /* Global Library Include file */
+#include "libwww/WWWLib.h"			      /* Global Library Include file */
-#include "WWWApp.h"
+#include "libwww/WWWApp.h"
-#include "WWWInit.h"
+#include "libwww/WWWInit.h"
 }
 
 #include "nel/gui/group_html.h"

code/nel/src/gui/libwww_nel_stream.cpp

@@ -21,16 +21,16 @@ extern "C"
 {
 
 	/* Library Includes */
-#include "wwwsys.h"
+#include "libwww/wwwsys.h"
-#include "WWWUtil.h"
+#include "libwww/WWWUtil.h"
-#include "WWWCore.h"
+#include "libwww/WWWCore.h"
-#include "WWWDir.h"
+#include "libwww/WWWDir.h"
-#include "WWWTrans.h"
+#include "libwww/WWWTrans.h"
-#include "HTReqMan.h"
+#include "libwww/HTReqMan.h"
-#include "HTBind.h"
+#include "libwww/HTBind.h"
-#include "HTMulti.h"
+#include "libwww/HTMulti.h"
-#include "HTNetMan.h"
+#include "libwww/HTNetMan.h"
-#include "HTChannl.h"
+#include "libwww/HTChannl.h"
 #include "nel/gui/libwww_nel_stream.h"		/* Implemented here */
 }