Merge with default

--HG--
branch : build_pipeline_v3

code/CMakeLists.txt

@@ -2,7 +2,7 @@
 #
 # NeL
 #  Authors: Nevrax and the NeL Community
-#  Version: 0.8.0
+#  Version: 0.9.0
 #
 # Notes:
 #   * Changing install location: add -DCMAKE_INSTALL_PREFIX:PATH=/my/new/path
@@ -41,10 +41,15 @@ INCLUDE(${CMAKE_ROOT}/Modules/Documentation.cmake OPTIONAL)
 # Force out of source builds.
 CHECK_OUT_OF_SOURCE()
 
+# Specify Mac OS X deployment target before including Darwin.cmake
+IF(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
+  SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.6")
+ENDIF(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
+
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(RyzomCore CXX C)
 SET(NL_VERSION_MAJOR 0)
-SET(NL_VERSION_MINOR 8)
+SET(NL_VERSION_MINOR 9)
 SET(NL_VERSION_PATCH 0)
 SET(NL_VERSION "${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}.${NL_VERSION_PATCH}")
 
@@ -135,6 +140,10 @@ IF(WITH_NEL)
     FIND_PACKAGE(CppTest)
   ENDIF(WITH_NEL_TESTS)
 
+  IF(WITH_GUI)
+    FIND_PACKAGE(Libwww REQUIRED)
+  ENDIF(WITH_GUI)
+
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include ${LIBXML2_INCLUDE_DIR})
   ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
   ADD_SUBDIRECTORY(nel)

code/CMakeModules/nel.cmake

@@ -601,22 +601,7 @@ MACRO(NL_SETUP_BUILD)
     ENDIF(WIN32)
 
     IF(APPLE)
-      IF(IOS)
+      IF(NOT XCODE)
-        # Disable CMAKE_OSX_DEPLOYMENT_TARGET for iOS
-        SET(CMAKE_OSX_DEPLOYMENT_TARGET "" CACHE PATH "" FORCE)
-      ELSE(IOS)
-        IF(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-          SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.6" CACHE PATH "" FORCE)
-        ENDIF(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-      ENDIF(IOS)
-
-      IF(XCODE)
-        IF(IOS)
-          SET(CMAKE_OSX_SYSROOT "iphoneos" CACHE PATH "" FORCE)
-        ELSE(IOS)
-#          SET(CMAKE_OSX_SYSROOT "macosx" CACHE PATH "" FORCE)
-        ENDIF(IOS)
-      ELSE(XCODE)
         IF(CMAKE_OSX_ARCHITECTURES)
           SET(TARGETS_COUNT 0)
           SET(_ARCHS)
@@ -792,16 +777,8 @@ MACRO(NL_SETUP_BUILD)
             SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} ${XARCH}-Wl,-macosx_version_min,${CMAKE_OSX_DEPLOYMENT_TARGET}")
           ENDIF(CMAKE_IOS_SIMULATOR_SYSROOT AND TARGET_X86)
         ELSE(IOS)
-          FOREACH(_SDK ${_CMAKE_OSX_SDKS})
-            IF(${_SDK} MATCHES "MacOSX${CMAKE_OSX_DEPLOYMENT_TARGET}\\.sdk")
-              SET(CMAKE_OSX_SYSROOT ${_SDK} CACHE PATH "" FORCE)
-            ENDIF(${_SDK} MATCHES "MacOSX${CMAKE_OSX_DEPLOYMENT_TARGET}\\.sdk")
-          ENDFOREACH(_SDK)
-
           IF(CMAKE_OSX_SYSROOT)
             ADD_PLATFORM_FLAGS("-isysroot ${CMAKE_OSX_SYSROOT}")
-          ELSE(CMAKE_OSX_SYSROOT)
-            MESSAGE(FATAL_ERROR "CMAKE_OSX_SYSROOT can't be determinated")
           ENDIF(CMAKE_OSX_SYSROOT)
 
           # Always force -mmacosx-version-min to override environement variable
@@ -814,7 +791,7 @@ MACRO(NL_SETUP_BUILD)
         IF(HAVE_FLAG_SEARCH_PATHS_FIRST)
           SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,-search_paths_first")
         ENDIF(HAVE_FLAG_SEARCH_PATHS_FIRST)
-      ENDIF(XCODE)
+      ENDIF(NOT XCODE)
     ELSE(APPLE)
       IF(HOST_CPU STREQUAL "x86_64" AND TARGET_CPU STREQUAL "x86")
         ADD_PLATFORM_FLAGS("-m32 -march=i686")

code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h

@@ -128,7 +128,7 @@ inline uint32 CPSAttribMakerBinOp<uint32>::getMinValue(void) const
 		{
 			uint32 lhs = _Arg[0]->getMinValue();
 			uint32 rhs = _Arg[1]->getMaxValue();
-			return rhs > rhs ? 0 : lhs - rhs;
+			return lhs > rhs ? 0 : lhs - rhs;
 		}
 		break;
 		default:
@@ -153,7 +153,7 @@ inline uint32 CPSAttribMakerBinOp<uint32>::getMaxValue(void) const
 		{
 			uint32 lhs = _Arg[0]->getMaxValue();
 			uint32 rhs = _Arg[1]->getMinValue();
-			return rhs > rhs ? 0 : lhs - rhs;
+			return lhs > rhs ? 0 : lhs - rhs;
 		}
 		break;
 		default:

code/nel/include/nel/gui/action_handler.h

@@ -71,6 +71,9 @@ namespace NLGUI
 		/// return pointer to action handler or null if it doesn't exist
 		IActionHandler *getActionHandler(const std::string &name) const
 		{
+			if( name.empty() )
+				return NULL;
+
 			TFactoryMap::const_iterator it = FactoryMap.find(name);
 			if( it == FactoryMap.end() )
 			{

code/nel/include/nel/gui/ctrl_button.h

@@ -35,6 +35,7 @@ namespace NLGUI
 	class CCtrlButton : public CCtrlBaseButton
 	{
 	public:
+        DECLARE_UI_CLASS( CCtrlButton )
 
 		/// Constructor
 		CCtrlButton(const TCtorParam &param) : CCtrlBaseButton(param)

code/nel/include/nel/gui/ctrl_col_pick.h

@@ -36,6 +36,7 @@ namespace NLGUI
 	{
 
 	public:
+        DECLARE_UI_CLASS( CCtrlColPick )
 
 		CCtrlColPick(const TCtorParam &param);
 		~CCtrlColPick();

code/nel/include/nel/gui/ctrl_polygon.h

@@ -43,7 +43,8 @@ namespace NLGUI
 	class CCtrlPolygon : public CCtrlBase
 	{
 	public:
-		CCtrlPolygon();
+        DECLARE_UI_CLASS( CCtrlPolygon )
+        CCtrlPolygon( const TCtorParam &param );
 		virtual uint32 getMemory() { return (uint32)(sizeof(*this)+_Id.size()); }
 		virtual void updateCoords();
 		virtual void draw();

code/nel/include/nel/gui/ctrl_quad.h

@@ -38,10 +38,12 @@ namespace NLGUI
 	class CCtrlQuad : public CCtrlBase
 	{
 	public:
+        DECLARE_UI_CLASS( CCtrlQuad )
+
 		enum TWrapMode { Repeat = 0, Clamp, CustomUVs, WrapModeCount };
 
 
-		CCtrlQuad();
+        CCtrlQuad( const TCtorParam &param );
 
 		// from CInterfaceElement
 		bool parse(xmlNodePtr cur,CInterfaceGroup *parentGroup);

code/nel/include/nel/gui/ctrl_sheet_selection.h

@@ -54,7 +54,7 @@ namespace NLGUI
 	  */
 	class CCtrlSheetSelection
 	{
-	public:
+    public:
 		// Add a group, and returns its index, or -1 if already created.
 		sint addGroup(const std::string &name);
 		// Get a group by its name (must exist)

code/nel/include/nel/gui/ctrl_text_button.h

@@ -38,6 +38,7 @@ namespace NLGUI
 	class CCtrlTextButton : public CCtrlBaseButton
 	{
 	public:
+        DECLARE_UI_CLASS( CCtrlTextButton )
 
 		/// Constructor
 		CCtrlTextButton(const TCtorParam &param);

code/nel/include/nel/gui/dbgroup_combo_box.h

@@ -39,6 +39,7 @@ namespace NLGUI
 	class CDBGroupComboBox : public CInterfaceGroup
 	{
 	public:
+        DECLARE_UI_CLASS( CDBGroupComboBox )
 
 		/// Constructor
 		CDBGroupComboBox(const TCtorParam &param);

code/nel/include/nel/gui/dbgroup_select_number.h

@@ -39,6 +39,7 @@ namespace NLGUI
 	class CDBGroupSelectNumber : public CInterfaceGroup
 	{
 	public:
+        DECLARE_UI_CLASS( CDBGroupSelectNumber )
 
 		/// Constructor
 		CDBGroupSelectNumber(const TCtorParam &param);

code/nel/include/nel/gui/dbview_bar.h

@@ -37,6 +37,7 @@ namespace NLGUI
 	public:
 		enum TViewBar { ViewBar_UltraMini, ViewBar_Mini, ViewBar_Normal, ViewBar_MiniThick };
 	public:
+        DECLARE_UI_CLASS( CDBViewBar )
 
 		/// Constructor
 		CDBViewBar(const TCtorParam &param)

code/nel/include/nel/gui/dbview_bar3.h

@@ -34,6 +34,7 @@ namespace NLGUI
 	class CDBViewBar3 : public CViewBitmap
 	{
 	public:
+        DECLARE_UI_CLASS( CDBViewBar3 )
 
 		/// Constructor
 		CDBViewBar3(const TCtorParam &param);

code/nel/include/nel/gui/dbview_digit.h

@@ -34,6 +34,7 @@ namespace NLGUI
 	class CDBViewDigit : public CViewBase
 	{
 	public:
+        DECLARE_UI_CLASS( CDBViewDigit )
 
 		/// Constructor
 		CDBViewDigit(const TCtorParam &param);

code/nel/include/nel/gui/dbview_number.h

@@ -35,6 +35,7 @@ namespace NLGUI
 	class CDBViewNumber : public CViewText
 	{
 	public:
+        DECLARE_UI_CLASS( CDBViewNumber )
 
 		/// Constructor
 		CDBViewNumber(const TCtorParam &param);

code/nel/include/nel/gui/dbview_quantity.h

@@ -35,6 +35,7 @@ namespace NLGUI
 	class CDBViewQuantity : public CViewText
 	{
 	public:
+        DECLARE_UI_CLASS( CDBViewQuantity )
 
 		/// Constructor
 		CDBViewQuantity(const TCtorParam &param);

code/nel/include/nel/gui/group_container.h

@@ -48,6 +48,7 @@ namespace NLGUI
 	{
 
 	public:
+        DECLARE_UI_CLASS( CCtrlResizer )
 
 		CCtrlResizer(const TCtorParam &param);
 		virtual void draw ();
@@ -98,8 +99,9 @@ namespace NLGUI
 	class CCtrlMover : public CCtrlBase
 	{
 	public:
+        DECLARE_UI_CLASS( CCtrlMover )
 
-		CCtrlMover(const TCtorParam &param, bool canMove, bool canOpen);
+        CCtrlMover(const TCtorParam &param, bool canMove = true, bool canOpen = true );
 		~CCtrlMover();
 		virtual void draw ();
 		virtual bool handleEvent (const NLGUI::CEventDescriptor &event);
@@ -163,6 +165,7 @@ namespace NLGUI
 			virtual void childrenMoved(uint srcIndex, uint destIndex, CGroupContainer *children) = 0;
 		};
 	public:
+        DECLARE_UI_CLASS( CGroupContainer )
 		CGroupContainer(const TCtorParam &param);
 		~CGroupContainer();
 

code/nel/include/nel/gui/group_editbox.h

@@ -32,6 +32,7 @@ namespace NLGUI
 	class CGroupEditBox : public CGroupEditBoxBase
 	{
 	public:
+        DECLARE_UI_CLASS( CGroupEditBox )
 
 		class IComboKeyHandler
 		{
@@ -42,7 +43,6 @@ namespace NLGUI
 
 		enum TEntryType { Text, Integer, PositiveInteger, Float, PositiveFloat, Alpha, AlphaNum, AlphaNumSpace, Password, Filename, PlayerName }; // the type of entry this edit bot can deal with
 
-		DECLARE_UI_CLASS( CGroupEditBox )
 		/// Constructor
 		CGroupEditBox(const TCtorParam &param);
 		/// Dtor

code/nel/include/nel/gui/group_frame.h

@@ -36,6 +36,7 @@ namespace NLGUI
 	class CGroupFrame : public CInterfaceGroup
 	{
 	public:
+        DECLARE_UI_CLASS( CGroupFrame )
 
 		/// Constructor
 		CGroupFrame(const TCtorParam &param);

code/nel/include/nel/gui/group_header.h

@@ -35,6 +35,8 @@ namespace NLGUI
 	class CGroupHeader : public CGroupList
 	{
 	public:
+        DECLARE_UI_CLASS( CGroupHeader )
+
 		REFLECT_EXPORT_START(CGroupHeader, CGroupList)
 			REFLECT_LUA_METHOD("enlargeColumns", luaEnlargeColumns);
 			REFLECT_LUA_METHOD("resizeColumnsAndContainer", luaResizeColumnsAndContainer);
@@ -67,6 +69,8 @@ namespace NLGUI
 	class CGroupHeaderEntry : public CInterfaceGroup
 	{
 	public:
+        DECLARE_UI_CLASS( CGroupHeaderEntry )
+
 		CGroupHeaderEntry(const TCtorParam &param);
 		xmlNodePtr serialize( xmlNodePtr parentNode, const char *type ) const;
 		// from CInterfaceGroup

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

@@ -31,7 +31,7 @@ typedef std::map<std::string, std::string>	TStyle;
 
 extern "C"
 {
-#include "libwww/WWWInit.h"
+#include "WWWInit.h"
 }
 
 namespace NLGUI
@@ -54,6 +54,8 @@ namespace NLGUI
 	class CGroupHTML : public CGroupScrollText
 	{
 	public:
+        DECLARE_UI_CLASS( CGroupHTML )
+
 		friend void TextAdd (struct _HText *me, const char * buf, int len);
 		friend void TextBeginElement (_HText *me, int element_number, const BOOL *present, const char **	value);
 		friend void TextEndElement (_HText *me, int element_number);
@@ -658,6 +660,8 @@ namespace NLGUI
 	class CGroupHTMLInputOffset : public CInterfaceGroup
 	{
 	public:
+        DECLARE_UI_CLASS( CGroupHTMLInputOffset )
+
 		sint32 Offset;
 		CGroupHTMLInputOffset(const TCtorParam &param);
 		xmlNodePtr serialize( xmlNodePtr parentNode, const char *type ) const;

code/nel/include/nel/gui/group_list.h

@@ -30,6 +30,8 @@ namespace NLGUI
 	class CGroupList : public CInterfaceGroup
 	{
 	public:
+        DECLARE_UI_CLASS( CGroupList )
+
 		enum EAlign
 		{
 			Bottom = 0,

code/nel/include/nel/gui/group_menu.h

@@ -42,6 +42,7 @@ namespace NLGUI
 	class CViewTextMenu : public CViewText
 	{
 	public:
+        DECLARE_UI_CLASS( CViewTextMenu )
 
 		CViewTextMenu(const TCtorParam &param) : CViewText(param)
 		{
@@ -97,6 +98,7 @@ namespace NLGUI
 	class CGroupSubMenu : public CGroupSubMenuBase
 	{
 	public:
+        DECLARE_UI_CLASS( CGroupSubMenu )
 
 		CGroupSubMenu(const TCtorParam &param);
 		virtual ~CGroupSubMenu();
@@ -290,6 +292,7 @@ namespace NLGUI
 	{
 
 	public:
+        DECLARE_UI_CLASS( CGroupMenu )
 
 		CGroupMenu(const TCtorParam &param);
 		virtual ~CGroupMenu();

code/nel/include/nel/gui/group_modal.h

@@ -35,6 +35,8 @@ namespace NLGUI
 	class CGroupModal : public CGroupFrame
 	{
 	public:
+        DECLARE_UI_CLASS( CGroupModal )
+
 		bool		SpawnOnMousePos		: 1;
 		bool		ExitClickOut		: 1;
 		bool		ExitClickL			: 1;

code/nel/include/nel/gui/group_paragraph.h

@@ -31,6 +31,8 @@ namespace NLGUI
 	class CCtrlLink : public CCtrlButton
 	{
 	public:
+        DECLARE_UI_CLASS( CCtrlLink )
+
 		CCtrlLink (const TCtorParam &param) : CCtrlButton(param)
 		{}
 	};
@@ -39,6 +41,8 @@ namespace NLGUI
 	class CGroupParagraph : public CInterfaceGroup
 	{
 	public:
+        DECLARE_UI_CLASS( CGroupParagraph )
+
 		enum EAlign
 		{
 			Bottom = 0,

code/nel/include/nel/gui/group_scrolltext.h

@@ -39,6 +39,8 @@ namespace NLGUI
 	class CGroupScrollText : public CInterfaceGroup
 	{
 	public:
+        DECLARE_UI_CLASS( CGroupScrollText )
+
 		/// Constructor
 		CGroupScrollText(const TCtorParam &param);
 		~CGroupScrollText();

code/nel/include/nel/gui/group_tab.h

@@ -43,6 +43,7 @@ namespace NLGUI
 	class CGroupTab : public CInterfaceGroup
 	{
 	public:
+        DECLARE_UI_CLASS( CGroupTab )
 
 		/// Constructor
 		CGroupTab(const TCtorParam &param);
@@ -153,6 +154,7 @@ namespace NLGUI
 	class CCtrlTabButton : public CCtrlTextButton
 	{
 	public:
+        DECLARE_UI_CLASS( CCtrlTabButton )
 
 		CCtrlTabButton(const TCtorParam &param);
 

code/nel/include/nel/gui/group_table.h

@@ -36,6 +36,8 @@ namespace NLGUI
 	{
 		friend class CGroupTable;
 	public:
+        DECLARE_UI_CLASS( CGroupCell )
+
 		CGroupCell(const TCtorParam &param);
 
 		enum TAlign
@@ -121,6 +123,7 @@ namespace NLGUI
 	class CGroupTable : public CInterfaceGroup
 	{
 	public:
+        DECLARE_UI_CLASS( CGroupTable )
 
 		///constructor
 		CGroupTable(const TCtorParam &param);

code/nel/include/nel/gui/group_tree.h

@@ -33,6 +33,7 @@ namespace NLGUI
 	{
 
 	public:
+        DECLARE_UI_CLASS( CGroupTree )
 
 		struct SNode;
 		// optional callback that is called when a node has been added

code/nel/include/nel/gui/group_wheel.h

@@ -28,6 +28,8 @@ namespace NLGUI
 	class CInterfaceGroupWheel : public CInterfaceGroup
 	{
 	public:
+        DECLARE_UI_CLASS( CInterfaceGroupWheel )
+
 		/// Constructor
 		CInterfaceGroupWheel(const TCtorParam &param);
 

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

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

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

@@ -20,7 +20,7 @@
 #define LIBWWW_NEL_STREAM_H
 
 
-#include "libwww/HTProt.h"
+#include "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/lua.h>
+#include <lua.h>
-#include <lua/lauxlib.h>
+#include <lauxlib.h>
-#include <lua/lualib.h>
+#include <lualib.h>
 }
 
 // load the lua dll, return 1 on success

code/nel/include/nel/gui/view_bitmap_combo.h

@@ -99,6 +99,8 @@ namespace NLGUI
 	class CViewBitmapCombo : public CViewBase, public NLMISC::ICDBNode::IPropertyObserver
 	{
 	public:
+        DECLARE_UI_CLASS( CViewBitmapCombo )
+
 		typedef std::vector<sint32> TIdArray;
 		typedef std::vector<std::string> TStringArray;
 		typedef std::vector<NLMISC::CRGBA>		 TColorArray;

code/nel/include/nel/gui/view_link.h

@@ -36,6 +36,7 @@ namespace NLGUI
 	class CViewLink : public CViewText
 	{
 	public:
+        DECLARE_UI_CLASS( CViewLink )
 
 		// Default constructor
 		CViewLink (const TCtorParam &param);

code/nel/include/nel/gui/view_polygon.h

@@ -36,7 +36,9 @@ namespace NLGUI
 	class CViewPolygon : public CViewBase
 	{
 	public:
-		CViewPolygon();
+        DECLARE_UI_CLASS( CViewPolygon )
+
+        CViewPolygon( const TCtorParam &param );
 		virtual uint32 getMemory() { return (uint32)(sizeof(*this)+_Id.size()); }
 		virtual void updateCoords();
 		virtual void draw();

code/nel/include/nel/gui/view_quad.h

@@ -36,10 +36,12 @@ namespace NLGUI
 	class CViewQuad : public CViewBase
 	{
 	public:
+        DECLARE_UI_CLASS( CViewQuad )
+
 		enum TWrapMode { Repeat = 0, Clamp, WrapModeCount };
 
 
-		CViewQuad();
+        CViewQuad( const TCtorParam &param );
 
 		// from CInterfaceElement
 		bool parse(xmlNodePtr cur,CInterfaceGroup *parentGroup);

code/nel/include/nel/gui/view_text_formated.h

@@ -35,6 +35,7 @@ namespace NLGUI
 	class CViewTextFormated : public  CViewText
 	{
 	public:
+        DECLARE_UI_CLASS( CViewTextFormated )
 
 		/// Interface for classes which can format the text for this view.
 		class IViewTextFormatter

code/nel/include/nel/gui/view_text_id.h

@@ -48,6 +48,7 @@ namespace NLGUI
 	class CViewTextID : public CViewText
 	{
 	public:
+        DECLARE_UI_CLASS( CViewTextID )
 		
 		/// Interface for classes which can provide text to CViewTextId
 		class IViewTextProvider

code/nel/include/nel/gui/view_text_id_formated.h

@@ -36,6 +36,8 @@ namespace NLGUI
 	class CViewTextIDFormated : public  CViewTextID
 	{
 	public:
+        DECLARE_UI_CLASS( CViewTextIDFormated )
+
 		CViewTextIDFormated(const TCtorParam &param) : CViewTextID(param)
 		{}
 

code/nel/include/nel/misc/cdb_check_sum.h

@@ -21,6 +21,8 @@
 
 #include "types_nl.h"
 
+#include <vector>
+
 namespace NLMISC{
 
 /**

code/nel/include/nel/misc/event_emitter_multi.h

@@ -33,7 +33,7 @@ class CEventEmitterMulti : public IEventEmitter
 {
 public:
 	/// dtor
-	~CEventEmitterMulti();
+	virtual ~CEventEmitterMulti();
 	/// add an emitter
 	void	addEmitter(IEventEmitter *e, bool mustDelete);
 	/// remove an emitter (and delete it if necessary)

code/nel/include/nel/misc/events.h

@@ -65,6 +65,7 @@ const CClassId EventStringId (0x49b5af8f, 0x7f52cd26);
 const CClassId EventActivateId (0x7da66b0a, 0x1ef74519);
 const CClassId EventSetFocusId (0x17650fac, 0x19f85dde);
 const CClassId EventDestroyWindowId (0x69be73fe, 0x4b07603b);
+const CClassId EventCloseWindowId (0xb5cb1333, 0xd092e63a);
 
 // Mouse events
 const CClassId EventMouseMoveId (0x3dd12fdb, 0x472f548b);
@@ -504,6 +505,19 @@ public:
 	virtual	CEvent			*clone() const {return new CEventDestroyWindow(*this);}
 };
 
+/**
+ * CEventCloseWindow
+ */
+class CEventCloseWindow : public CEvent
+{
+public:
+	CEventCloseWindow (IEventEmitter* emitter) : CEvent (emitter, EventCloseWindowId)
+	{
+	}
+
+	virtual	CEvent			*clone() const {return new CEventCloseWindow(*this);}
+};
+
 /**
  * CEventIME
  */

code/nel/src/gui/CMakeLists.txt

@@ -1,14 +1,40 @@
+FIND_PACKAGE( Libwww REQUIRED )
+FIND_PACKAGE( CURL REQUIRED )
+FIND_PACKAGE( Lua51 REQUIRED )
+FIND_PACKAGE( Luabind REQUIRED )
+
 FILE(GLOB SRC *.cpp *.h)
 FILE(GLOB HEADERS ../../include/nel/gui/*.h)
 
-NL_TARGET_LIB(nelgui ${HEADERS} ${SRC})
+SOURCE_GROUP("include" FILES ${HEADERS})
+SOURCE_GROUP("src" FILES ${SRC})
+
+NL_TARGET_LIB(nelgui ${SRC} ${HEADERS})
 
 SET_TARGET_PROPERTIES(nelgui PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelgui "NeL, Library: NeL GUI")
 NL_ADD_RUNTIME_FLAGS(nelgui)
 
+INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR} ${LIBWWW_INCLUDE_DIR})
+
 NL_ADD_LIB_SUFFIX(nelgui)
 
+#MESSAGE( "libww libs: ${LIBWWW_LIBRARIES}" )
+
+TARGET_LINK_LIBRARIES(  nelgui
+			nelmisc
+			nel3d
+			${LUA_LIBRARIES}
+			${LUABIND_LIBRARIES}
+			${LIBXML2_LIBRARIES}
+			${LIBWWW_LIBRARIES}
+			${CURL_LIBRARIES}
+			)
+
+IF(WITH_PCH)
+  ADD_NATIVE_PRECOMPILED_HEADER(nelgui ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
+ENDIF(WITH_PCH)
+
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS nelgui LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
 ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)

code/nel/src/gui/action_handler.cpp

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
+#include "stdpch.h"
 #include "nel/gui/action_handler.h"
 #include "nel/gui/group_container_base.h"
 #include "nel/gui/interface_property.h"

code/nel/src/gui/ctrl_base.cpp

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
+#include "stdpch.h"
 #include "libxml/globals.h"
 #include "nel/misc/debug.h"
 #include "nel/misc/xml_auto_ptr.h"
@@ -146,7 +148,7 @@ namespace NLGUI
 		_ToolTipParent= TTCtrl;
 		if(prop)
 		{
-			_ToolTipParent = stringToToolTipParent( std::string( prop ) );
+			_ToolTipParent = stringToToolTipParent( std::string( (const char*)prop ) );
 		}
 
 		// Tooltip special parent

code/nel/src/gui/ctrl_base_button.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/gui/ctrl_base_button.h"
 #include "nel/misc/xml_auto_ptr.h"
 #include "nel/gui/interface_group.h"
@@ -282,7 +283,8 @@ namespace NLGUI
 		else
 		if( name == "onover" )
 		{
-			_AHOnOver = CAHManager::getInstance()->getAH( value, std::string() );
+			std::string dummy;
+			_AHOnOver = CAHManager::getInstance()->getAH( value, dummy );
 			mapAHString( "onover", value );
 			return;
 		}
@@ -295,7 +297,8 @@ namespace NLGUI
 		else
 		if( name == "onclick_l" )
 		{
-			_AHOnLeftClick = CAHManager::getInstance()->getAH( value, std::string() );
+			std::string dummy;
+			_AHOnLeftClick = CAHManager::getInstance()->getAH( value, dummy );
 			mapAHString( "onclick_l", value );
 			return;
 		}
@@ -308,7 +311,8 @@ namespace NLGUI
 		else
 		if( name == "ondblclick_l" )
 		{
-			_AHOnLeftDblClick = CAHManager::getInstance()->getAH( value, std::string() );
+			std::string dummy;
+			_AHOnLeftDblClick = CAHManager::getInstance()->getAH( value, dummy );
 			mapAHString( "ondblclick_l", value );
 			return;
 		}
@@ -321,7 +325,8 @@ namespace NLGUI
 		else
 		if( name == "onlongclick_l" )
 		{
-			_AHOnLeftLongClick = CAHManager::getInstance()->getAH( value, std::string() );
+			std::string dummy;
+			_AHOnLeftLongClick = CAHManager::getInstance()->getAH( value, dummy );
 			mapAHString( "onlongclick_l", value );
 			return;
 		}
@@ -334,7 +339,8 @@ namespace NLGUI
 		else
 		if( name == "onclick_r" )
 		{
-			_AHOnRightClick = CAHManager::getInstance()->getAH( value, std::string() );
+			std::string dummy;
+			_AHOnRightClick = CAHManager::getInstance()->getAH( value, dummy );
 			mapAHString( "onclick_r", value );
 			return;
 		}
@@ -347,7 +353,8 @@ namespace NLGUI
 		else
 		if( name == "onclock_tick" )
 		{
-			_AHOnClockTick = CAHManager::getInstance()->getAH( value, std::string() );
+			std::string dummy;
+			_AHOnClockTick = CAHManager::getInstance()->getAH( value, dummy );
 			mapAHString( "onclock_tick", value );
 			return;
 		}
@@ -543,27 +550,27 @@ namespace NLGUI
 		{
 			prop = (char*) xmlGetProp( cur, BAD_CAST "onover" );
 			if( prop != NULL )
-				mapAHString( "onover", std::string( prop ) );
+				mapAHString( "onover", std::string( (const char*)prop ) );
 
 			prop = (char*) xmlGetProp( cur, BAD_CAST "onclick_l" );
 			if( prop != NULL )
-				mapAHString( "onclick_l", std::string( prop ) );
+				mapAHString( "onclick_l", std::string( (const char*)prop ) );
 
 			prop = (char*) xmlGetProp( cur, BAD_CAST "ondblclick_l" );
 			if( prop != NULL )
-				mapAHString( "ondblclick_l", std::string( prop ) );
+				mapAHString( "ondblclick_l", std::string( (const char*)prop ) );
 
 			prop = (char*) xmlGetProp( cur, BAD_CAST "onclick_r" );
 			if( prop != NULL )
-				mapAHString( "onclick_r", std::string( prop ) );
+				mapAHString( "onclick_r", std::string( (const char*)prop ) );
 
 			prop = (char*) xmlGetProp( cur, BAD_CAST "onlongclick_l" );
 			if( prop != NULL )
-				mapAHString( "onlongclick_l", std::string( prop ) );
+				mapAHString( "onlongclick_l", std::string( (const char*)prop ) );
 
 			prop = (char*) xmlGetProp( cur, BAD_CAST "onclock_tick" );
 			if( prop != NULL )
-				mapAHString( "onclock_tick", std::string( prop ) );
+				mapAHString( "onclock_tick", std::string( (const char*)prop ) );
 		}
 
 		// Context menu association

code/nel/src/gui/ctrl_button.cpp

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
+#include "stdpch.h"
 #include "nel/gui/ctrl_button.h"
 #include "nel/misc/xml_auto_ptr.h"
 #include "nel/gui/widget_manager.h"
@@ -231,7 +233,7 @@ namespace NLGUI
 		prop = (char*) xmlGetProp (cur, (xmlChar*)"align");
 		if (prop)
 		{
-			setAlignFromString( std::string( prop ) );
+			setAlignFromString( std::string( (const char*)prop ) );
 		}
 
 

code/nel/src/gui/ctrl_col_pick.cpp

@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-
+#include "stdpch.h"
 #include "nel/gui/ctrl_col_pick.h"
 #include "nel/misc/xml_auto_ptr.h"
 #include "nel/gui/view_renderer.h"

code/nel/src/gui/ctrl_draggable.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/gui/ctrl_draggable.h"
 
 namespace NLGUI

code/nel/src/gui/ctrl_polygon.cpp

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
+#include "stdpch.h"
 #include "nel/gui/ctrl_polygon.h"
 #include "nel/gui/widget_manager.h"
 #include "nel/gui/view_renderer.h"
@@ -25,7 +27,7 @@ namespace NLGUI
 {
 
 	// *********************************************************************************
-	CCtrlPolygon::CCtrlPolygon() : CCtrlBase(TCtorParam())
+    CCtrlPolygon::CCtrlPolygon( const TCtorParam &param ) : CCtrlBase( param )
 	{
 		// Construct
 		_Color = CRGBA::White;

code/nel/src/gui/ctrl_quad.cpp

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
+#include "stdpch.h"
 #include "nel/gui/ctrl_quad.h"
 #include "nel/gui/interface_group.h"
 #include "nel/gui/widget_manager.h"
@@ -25,7 +27,7 @@ namespace NLGUI
 {
 
 	// *********************************************************************************
-	CCtrlQuad::CCtrlQuad() : CCtrlBase(TCtorParam()), _Color(CRGBA::White),
+    CCtrlQuad::CCtrlQuad( const TCtorParam &param ) : CCtrlBase( param ), _Color(CRGBA::White),
 													  _Additif(false),
 													  _Filtered(true),
 													  _UMin(0.f),

code/nel/src/gui/ctrl_scroll.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/gui/widget_manager.h"
 #include "nel/gui/action_handler.h"
 #include "nel/gui/interface_group.h"
@@ -292,7 +293,8 @@ namespace NLGUI
 			{
 				_IsDBLink = true;
 				_DBLink.link( value.c_str() );
-				_DBLink.getNodePtr()->addObserver( this, ICDBNode::CTextId() );
+				ICDBNode::CTextId dummy;
+				_DBLink.getNodePtr()->addObserver( this, dummy );
 			}
 			return;
 		}

code/nel/src/gui/ctrl_scroll_base.cpp

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
+#include "stdpch.h"
 #include "nel/gui/ctrl_scroll_base.h"
 
 namespace NLGUI

code/nel/src/gui/ctrl_sheet_selection.cpp

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
+#include "stdpch.h"
 #include <string>
 #include <map>
 #include "nel/misc/types_nl.h"

code/nel/src/gui/ctrl_text_button.cpp

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
+#include "stdpch.h"
 #include "nel/gui/ctrl_text_button.h"
 #include "nel/misc/xml_auto_ptr.h"
 #include "nel/gui/view_text.h"

code/nel/src/gui/ctrl_tooltip.cpp

@@ -15,12 +15,10 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-
+#include "stdpch.h"
-// ----------------------------------------------------------------------------
 #include "nel/gui/ctrl_tooltip.h"
 #include "nel/misc/xml_auto_ptr.h"
 
-// ----------------------------------------------------------------------------
 using namespace std;
 using namespace NLMISC;
 using namespace NL3D;

code/nel/src/gui/db_manager.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/gui/db_manager.h"
 
 namespace NLGUI

code/nel/src/gui/dbgroup_combo_box.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/gui/dbgroup_combo_box.h"
 #include "nel/gui/group_menu.h"
 #include "nel/misc/xml_auto_ptr.h"

code/nel/src/gui/dbgroup_select_number.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/gui/dbgroup_select_number.h"
 #include "nel/gui/view_text.h"
 #include "nel/gui/view_bitmap.h"

code/nel/src/gui/dbview_bar.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/gui/dbview_bar.h"
 #include "nel/misc/xml_auto_ptr.h"
 #include "nel/gui/interface_group.h"

code/nel/src/gui/dbview_bar3.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/gui/dbview_bar3.h"
 #include "nel/misc/xml_auto_ptr.h"
 #include "nel/gui/interface_group.h"

code/nel/src/gui/dbview_digit.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/gui/dbview_digit.h"
 #include "nel/misc/xml_auto_ptr.h"
 #include "nel/gui/view_renderer.h"

code/nel/src/gui/dbview_number.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/gui/dbview_number.h"
 #include "nel/misc/xml_auto_ptr.h"
 #include "nel/misc/common.h"

code/nel/src/gui/dbview_quantity.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/gui/dbview_quantity.h"
 #include "nel/misc/xml_auto_ptr.h"
 #include "nel/misc/i18n.h"

code/nel/src/gui/event_descriptor.cpp

@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-
+#include "stdpch.h"
 #include "nel/misc/events.h"
 #include "nel/gui/event_descriptor.h"
 

code/nel/src/gui/event_listener.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/misc/event_server.h"
 #include "nel/gui/event_listener.h"
 #include "nel/gui/interface_group.h"

code/nel/src/gui/group_container.cpp

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
+#include "stdpch.h"
 #include "nel/gui/group_container.h"
 #include "nel/gui/interface_options.h"
 #include "nel/misc/xml_auto_ptr.h"
@@ -1733,7 +1735,8 @@ namespace NLGUI
 		else
 		if( name == "on_open" )
 		{
-			_AHOnOpen = CAHManager::getInstance()->getAH( value, std::string() );
+			std::string dummy;
+			_AHOnOpen = CAHManager::getInstance()->getAH( value, dummy );
 			mapAHString( name, value );
 			return;
 		}
@@ -1746,7 +1749,8 @@ namespace NLGUI
 		else
 		if( name == "on_close" )
 		{
-			_AHOnClose = CAHManager::getInstance()->getAH( value, std::string() );
+			std::string dummy;
+			_AHOnClose = CAHManager::getInstance()->getAH( value, dummy );
 			mapAHString( name, value );
 			return;
 		}
@@ -1759,7 +1763,8 @@ namespace NLGUI
 		else
 		if( name == "on_close_button" )
 		{
-			_AHOnCloseButton = CAHManager::getInstance()->getAH( value, std::string() );
+			std::string dummy;
+			_AHOnCloseButton = CAHManager::getInstance()->getAH( value, dummy );
 			mapAHString( name, value );
 			return;
 		}
@@ -1772,7 +1777,8 @@ namespace NLGUI
 		else
 		if( name == "on_move" )
 		{
-			_AHOnMove = CAHManager::getInstance()->getAH( value, std::string() );
+			std::string dummy;
+			_AHOnMove = CAHManager::getInstance()->getAH( value, dummy );
 			mapAHString( name, value );
 			return;
 		}
@@ -1785,7 +1791,8 @@ namespace NLGUI
 		else
 		if( name == "on_deactive_check" )
 		{
-			_AHOnDeactiveCheck  = CAHManager::getInstance()->getAH( value, std::string() );
+			std::string dummy;
+			_AHOnDeactiveCheck  = CAHManager::getInstance()->getAH( value, dummy );
 			mapAHString( name, value );
 			return;
 		}
@@ -1798,7 +1805,8 @@ namespace NLGUI
 		else
 		if( name == "on_resize" )
 		{
-			_AHOnResize = CAHManager::getInstance()->getAH( value, std::string() );
+			std::string dummy;
+			_AHOnResize = CAHManager::getInstance()->getAH( value, dummy );
 			mapAHString( name, value );
 			return;
 		}
@@ -1811,7 +1819,8 @@ namespace NLGUI
 		else
 		if( name == "on_alpha_settings_changed" )
 		{
-			_AHOnAlphaSettingsChanged = CAHManager::getInstance()->getAH( value, std::string() );
+			std::string dummy;
+			_AHOnAlphaSettingsChanged = CAHManager::getInstance()->getAH( value, dummy );
 			mapAHString( name, value );
 			return;
 		}
@@ -1824,7 +1833,8 @@ namespace NLGUI
 		else
 		if( name == "on_begin_move" )
 		{
-			_AHOnBeginMove = CAHManager::getInstance()->getAH( value, std::string() );
+			std::string dummy;
+			_AHOnBeginMove = CAHManager::getInstance()->getAH( value, dummy );
 			mapAHString( name, value );
 			return;
 		}
@@ -2224,35 +2234,35 @@ namespace NLGUI
 		{
 			ptr = xmlGetProp( cur, BAD_CAST "on_open" );
 			if( ptr != NULL )
-				mapAHString( "on_open", std::string( ptr ) );
+				mapAHString( "on_open", std::string( (const char*)ptr ) );
 
 			ptr = xmlGetProp( cur, BAD_CAST "on_close" );
 			if( ptr != NULL )
-				mapAHString( "on_close", std::string( ptr ) );
+				mapAHString( "on_close", std::string( (const char*)ptr ) );
 
 			ptr = xmlGetProp( cur, BAD_CAST "on_close_button" );
 			if( ptr != NULL )
-				mapAHString( "on_close_button", std::string( ptr ) );
+				mapAHString( "on_close_button", std::string( (const char*)ptr ) );
 
 			ptr = xmlGetProp( cur, BAD_CAST "on_move" );
 			if( ptr != NULL )
-				mapAHString( "on_move", std::string( ptr ) );
+				mapAHString( "on_move", std::string( (const char*)ptr ) );
 
 			ptr = xmlGetProp( cur, BAD_CAST "on_deactive_check" );
 			if( ptr != NULL )
-				mapAHString( "on_deactive_check", std::string( ptr ) );
+				mapAHString( "on_deactive_check", std::string( (const char*)ptr ) );
 
 			ptr = xmlGetProp( cur, BAD_CAST "on_resize" );
 			if( ptr != NULL )
-				mapAHString( "on_resize", std::string( ptr ) );
+				mapAHString( "on_resize", std::string( (const char*)ptr ) );
 
 			ptr = xmlGetProp( cur, BAD_CAST "on_alpha_settings_changed" );
 			if( ptr != NULL )
-				mapAHString( "on_alpha_settings_changed", std::string( ptr ) );
+				mapAHString( "on_alpha_settings_changed", std::string( (const char*)ptr ) );
 
 			ptr = xmlGetProp( cur, BAD_CAST "on_begin_move" );
 			if( ptr != NULL )
-				mapAHString( "on_begin_move", std::string( ptr ) );
+				mapAHString( "on_begin_move", std::string( (const char*)ptr ) );
 		}
 
 		ptr = xmlGetProp (cur, (xmlChar*)"max_w");

code/nel/src/gui/group_container_base.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/gui/group_container_base.h"
 
 namespace NLGUI

code/nel/src/gui/group_editbox.cpp

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
+#include "stdpch.h"
 #include "nel/gui/group_editbox.h"
 #include "nel/misc/command.h"
 #include "nel/gui/view_text.h"
@@ -25,6 +27,7 @@
 #include "nel/gui/widget_manager.h"
 #include "nel/gui/view_renderer.h"
 #include "nel/gui/db_manager.h"
+#include <limits>
 
 using namespace std;
 using namespace NLMISC;
@@ -538,7 +541,7 @@ namespace NLGUI
 		{
 			prop = (char*) xmlGetProp( cur, BAD_CAST "onenter" );
 			if( prop != NULL )
-				mapAHString( "onenter", std::string( prop ) );
+				mapAHString( "onenter", std::string( (const char*)prop ) );
 		}
 
 		prop = (char*) xmlGetProp( cur, (xmlChar*)"onchange" );

code/nel/src/gui/group_editbox_base.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/gui/group_editbox_base.h"
 
 namespace NLGUI

code/nel/src/gui/group_frame.cpp

@@ -14,7 +14,9 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "stdpch.h"
 #include "nel/gui/group_frame.h"
+
 #include "nel/gui/widget_manager.h"
 #include "nel/gui/interface_options.h"
 #include "nel/gui/interface_element.h"
@@ -139,7 +141,7 @@ namespace NLGUI
 		ptr = (char*) xmlGetProp( cur, (xmlChar*)"options" );
 		if (ptr)
 		{
-			_Options = std::string( ptr );
+			_Options = std::string( (const char*)ptr );
 		}
 
 		// The first type in display type struct is the default display type

code/nel/src/gui/group_header.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/gui/group_container.h"
 #include "nel/gui/group_header.h"
 #include "nel/gui/lua_ihm.h"

code/nel/src/gui/group_html.cpp

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

code/nel/src/gui/group_list.cpp

@@ -14,7 +14,9 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "stdpch.h"
 #include "nel/gui/group_list.h"
+
 #include "nel/gui/interface_element.h"
 #include "nel/gui/view_bitmap.h"
 #include "nel/gui/view_text_id.h"
@@ -507,7 +509,7 @@ namespace NLGUI
 		ptr = (char*) xmlGetProp( cur,   (xmlChar*)"hardtext" );
 		if (ptr)
 		{
-			_HardText = std::string( ptr );
+			_HardText = std::string( (const char*)ptr );
 			const char *propPtr = ptr;
 			ucstring Text = ucstring(propPtr);
 			if ((strlen(propPtr)>2) && (propPtr[0] == 'u') && (propPtr[1] == 'i'))

code/nel/src/gui/group_menu.cpp

@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "stdpch.h"
 #include "nel/gui/interface_options.h"
 #include "nel/gui/interface_expr.h"
 #include "nel/gui/group_menu.h"
@@ -2180,7 +2181,7 @@ namespace NLGUI
 		if (prop)
 		{
 			if( editorMode )
-				_Extends = std::string( prop );
+				_Extends = std::string( (const char*)prop );
 
 			CGroupMenu *gm = dynamic_cast<CGroupMenu *>(CWidgetManager::getInstance()->getElementFromId(prop));
 			if (!gm)

code/nel/src/gui/group_modal.cpp

@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-
+#include "stdpch.h"
 #include "nel/gui/group_modal.h"
 #include "nel/gui/interface_element.h"
 #include "nel/misc/xml_auto_ptr.h"

code/nel/src/gui/group_paragraph.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/gui/group_paragraph.h"
 #include "nel/gui/group_html.h"
 #include "nel/gui/widget_manager.h"
@@ -462,7 +463,7 @@ namespace NLGUI
 		ptr = (char*) xmlGetProp( cur, (xmlChar*)"hardtext" );
 		if (ptr)
 		{
-			_HardText = std::string( ptr );
+			_HardText = std::string( (const char*)ptr );
 			const char *propPtr = ptr;
 			ucstring Text = ucstring(propPtr);
 			if ((strlen(propPtr)>2) && (propPtr[0] == 'u') && (propPtr[1] == 'i'))

code/nel/src/gui/group_scrolltext.cpp

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
+#include "stdpch.h"
 #include "nel/gui/group_scrolltext.h"
 #include "nel/gui/group_list.h"
 #include "nel/gui/view_text.h"

code/nel/src/gui/group_submenu_base.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/gui/group_submenu_base.h"
 
 namespace NLGUI

code/nel/src/gui/group_tab.cpp

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
+#include "stdpch.h"
 #include "nel/gui/group_tab.h"
 #include "nel/misc/xml_auto_ptr.h"
 #include "nel/gui/lua_ihm.h"

code/nel/src/gui/group_table.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/gui/group_table.h"
 #include "nel/gui/widget_manager.h"
 #include "nel/gui/interface_element.h"

code/nel/src/gui/group_tree.cpp

@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-
+#include "stdpch.h"
 #include "nel/gui/group_tree.h"
 #include "nel/gui/interface_element.h"
 #include "nel/gui/view_bitmap.h"

code/nel/src/gui/group_wheel.cpp

@@ -15,8 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-
+#include "stdpch.h"
-// ----------------------------------------------------------------------------
 #include "nel/gui/group_wheel.h"
 
 
@@ -61,7 +60,8 @@ namespace NLGUI
 	{
 		if( name == "on_wheel_up" )
 		{
-			_AHWheelUp = CAHManager::getInstance()->getAH( value, std::string() );
+			std::string dummy;
+			_AHWheelUp = CAHManager::getInstance()->getAH( value, dummy );
 			mapAHString( name, value );
 			return;
 		}
@@ -74,7 +74,8 @@ namespace NLGUI
 		else
 		if( name == "on_wheel_down" )
 		{
-			_AHWheelDown = CAHManager::getInstance()->getAH( value, std::string() );
+			std::string dummy;
+			_AHWheelDown = CAHManager::getInstance()->getAH( value, dummy );
 			mapAHString( name, value );
 			return;
 		}
@@ -119,11 +120,11 @@ namespace NLGUI
 		{
 			CXMLAutoPtr ptr( (char*) xmlGetProp( cur, BAD_CAST "on_wheel_up" ) );
 			if( ptr != NULL )
-				mapAHString( "on_wheel_up", std::string( ptr ) );
+				mapAHString( "on_wheel_up", std::string( (const char*)ptr ) );
 
 			ptr = (char*) xmlGetProp( cur, BAD_CAST "on_wheel_down" );
 			if( ptr != NULL )
-				mapAHString( "on_wheel_down", std::string( ptr ) );
+				mapAHString( "on_wheel_down", std::string( (const char*)ptr ) );
 
 		}
 

code/nel/src/gui/input_handler.cpp

@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "stdpch.h"
 #include "nel/gui/input_handler.h"
 
 namespace NLGUI

code/nel/src/gui/interface_anim.cpp

@@ -14,7 +14,9 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "stdpch.h"
 #include "nel/gui/interface_anim.h"
+
 #include "nel/gui/widget_manager.h"
 #include "nel/gui/interface_expr.h"
 #include "nel/misc/xml_auto_ptr.h"

code/nel/src/gui/interface_element.cpp

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
+#include "stdpch.h"
 #include "nel/gui/interface_group.h"
 #include "nel/gui/interface_property.h"
 #include "nel/gui/view_renderer.h"
@@ -362,13 +364,13 @@ namespace NLGUI
 		ptr = (char*) xmlGetProp( cur, (xmlChar*)"posparent" );
 		if (ptr)
 		{
-			setPosParent( std::string( ptr ) );
+			setPosParent( std::string( (const char*)ptr ) );
 		}
 
 		ptr = (char*) xmlGetProp( cur, (xmlChar*)"sizeparent" );
 		if (ptr)
 		{
-			setSizeParent( std::string( ptr ) );
+			setSizeParent( std::string( (const char*)ptr ) );
 		}
 
 		ptr = (char*) xmlGetProp (cur, (xmlChar*)"sizeref");

code/nel/src/gui/interface_expr.cpp

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
+#include "stdpch.h"
 #include "nel/misc/algo.h"
 #include <algorithm>
 #include "nel/gui/db_manager.h"

code/nel/src/gui/interface_expr_node.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/misc/cdb_leaf.h"
 #include "nel/misc/cdb_branch.h"
 #include "nel/gui/interface_expr_node.h"

code/nel/src/gui/interface_expr_user_fct.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/gui/interface_expr.h"
 #include "nel/gui/interface_link.h"
 #include "nel/gui/interface_element.h"

code/nel/src/gui/interface_group.cpp

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
+#include "stdpch.h"
 #include "libxml/globals.h"
 #include "nel/misc/debug.h"
 #include "nel/misc/xml_auto_ptr.h"
@@ -348,27 +350,27 @@ namespace NLGUI
 		{
 			ptr = (char*) xmlGetProp( cur, BAD_CAST "on_active" );
 			if( ptr != NULL )
-				mapAHString( "on_active", std::string( ptr ) );
+				mapAHString( "on_active", std::string( (const char*)ptr ) );
 
 			ptr = (char*) xmlGetProp( cur, BAD_CAST "on_deactive" );
 			if( ptr != NULL )
-				mapAHString( "on_deactive", std::string( ptr ) );
+				mapAHString( "on_deactive", std::string( (const char*)ptr ) );
 
 			ptr = (char*) xmlGetProp( cur, BAD_CAST "group_onclick_r" );
 			if( ptr != NULL )
-				mapAHString( "group_onclick_r", std::string( ptr ) );
+				mapAHString( "group_onclick_r", std::string( (const char*)ptr ) );
 
 			ptr = (char*) xmlGetProp( cur, BAD_CAST "group_onclick_l" );
 			if( ptr != NULL )
-				mapAHString( "group_onclick_l", std::string( ptr ) );
+				mapAHString( "group_onclick_l", std::string( (const char*)ptr ) );
 
 			ptr = (char*) xmlGetProp( cur, BAD_CAST "on_enter" );
 			if( ptr != NULL )
-				mapAHString( "on_enter", std::string( ptr ) );
+				mapAHString( "on_enter", std::string( (const char*)ptr ) );
 
 			ptr = (char*) xmlGetProp( cur, BAD_CAST "on_escape" );
 			if( ptr != NULL )
-				mapAHString( "on_escape", std::string( ptr ) );
+				mapAHString( "on_escape", std::string( (const char*)ptr ) );
 		}
 
 
@@ -562,7 +564,8 @@ namespace NLGUI
 		else
 		if( name == "on_active" )
 		{
-			_AHOnActive = CAHManager::getInstance()->getAH( value, std::string() );
+			std::string dummy;
+			_AHOnActive = CAHManager::getInstance()->getAH( value, dummy );
 			mapAHString( name, value );
 			return;
 		}
@@ -575,7 +578,8 @@ namespace NLGUI
 		else
 		if( name == "on_deactive" )
 		{
-			_AHOnDeactive = CAHManager::getInstance()->getAH( value, std::string() );
+			std::string dummy;
+			_AHOnDeactive = CAHManager::getInstance()->getAH( value, dummy );
 			mapAHString( name, value );
 			return;
 		}
@@ -623,7 +627,8 @@ namespace NLGUI
 		else
 		if( name == "group_onclick_r" )
 		{
-			_AHOnRightClick = CAHManager::getInstance()->getAH( value, std::string() );
+			std::string dummy;
+			_AHOnRightClick = CAHManager::getInstance()->getAH( value, dummy );
 			mapAHString( name, value );
 			return;
 		}
@@ -636,7 +641,8 @@ namespace NLGUI
 		else
 		if( name == "group_onclick_l" )
 		{
-			_AHOnLeftClick = CAHManager::getInstance()->getAH( value, std::string() );
+			std::string dummy;
+			_AHOnLeftClick = CAHManager::getInstance()->getAH( value, dummy );
 			mapAHString( name, value );
 			return;
 		}
@@ -649,7 +655,8 @@ namespace NLGUI
 		else
 		if( name == "on_enter" )
 		{
-			_AHOnEnter = CAHManager::getInstance()->getAH( value, std::string() );
+			std::string dummy;
+			_AHOnEnter = CAHManager::getInstance()->getAH( value, dummy );
 			mapAHString( name, value );
 			return;
 		}
@@ -678,7 +685,8 @@ namespace NLGUI
 		else
 		if( name == "on_escape" )
 		{
-			_AHOnEscape = CAHManager::getInstance()->getAH( value, std::string() );
+			std::string dummy;
+			_AHOnEscape = CAHManager::getInstance()->getAH( value, dummy );
 			mapAHString( name, value );
 			return;
 		}

code/nel/src/gui/interface_link.cpp

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
+#include "stdpch.h"
 #include "nel/gui/interface_expr.h"
 #include "nel/gui/interface_expr_node.h"
 #include "nel/gui/reflect.h"

code/nel/src/gui/interface_options.cpp

@@ -15,9 +15,10 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
+#include "nel/gui/interface_options.h"
 
 #include "nel/gui/interface_element.h"
-#include "nel/gui/interface_options.h"
 #include "nel/gui/view_renderer.h"
 #include "nel/misc/factory.h"
 #include <string>

code/nel/src/gui/interface_parser.cpp

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
+#include "stdpch.h"
 #include <map>
 #include "nel/misc/rgba.h"
 #include "nel/gui/interface_parser.h"
@@ -1000,7 +1002,7 @@ namespace NLGUI
 		std::string target;
 		if( ptr != NULL )
 		{
-			target = std::string( ptr );
+			target = std::string( (const char*)ptr );
 			if( !editorMode )
 				CInterfaceLink::splitLinkTargets(std::string((const char*)ptr), parentGroup, targets);
 		}
@@ -1134,17 +1136,17 @@ namespace NLGUI
 
 			ptr = xmlGetProp( cur, BAD_CAST "entry" );
 			if( ptr != NULL )
-				data.entry = std::string( ptr );
+				data.entry = std::string( (const char*)ptr );
 
 			data.type = type;
 
 			ptr = xmlGetProp( cur, BAD_CAST "value" );
 			if( ptr != NULL )
-				data.value = std::string( ptr );
+				data.value = std::string( (const char*)ptr );
 
 			ptr = xmlGetProp( cur, BAD_CAST "size" );
 			if( ptr != NULL )
-				fromString( std::string( ptr ), data.size );
+				fromString( std::string( (const char*)ptr ), data.size );
 			
 			variableCache[ data.entry ] = data;
 		}

code/nel/src/gui/interface_property.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/misc/rgba.h"
 #include "nel/gui/interface_property.h"
 #include "nel/gui/interface_common.h"

code/nel/src/gui/libwww.cpp

@@ -14,25 +14,21 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#define NOMINMAX
+#include "stdpch.h"
 
 #include "nel/gui/group_html.h"
 
 // LibWWW
 extern "C"
 {
-#include "libwww/WWWLib.h"			      /* Global Library Include file */
+#include "WWWLib.h"			      /* Global Library Include file */
-#include "libwww/WWWApp.h"
+#include "WWWApp.h"
-#include "libwww/WWWInit.h"
+#include "WWWInit.h"
 }
 
 #include "nel/gui/group_html.h"
 #include "nel/gui/libwww_nel_stream.h"
 
-#ifdef HAVE_REVISION_H
-#include "revision.h"
-#endif
-
 using namespace NLMISC;
 
 // The HText structure for libwww
@@ -554,35 +550,6 @@ namespace NLGUI
 			HTTrace_setCallback(NelTracer);
 
 			/* Initiate libwww */
-
-#if defined(HAVE_X86_64)
-#define RYZOM_ARCH "x64"
-#elif defined(HAVE_X86)
-#define RYZOM_ARCH "x86"
-#elif defined(HAVE_ARM)
-#define RYZOM_ARCH "arm"
-#else
-#define RYZOM_ARCH "unknow"
-#endif
-#if defined(NL_OS_WINDOWS)
-#define RYZOM_SYSTEM "windows"
-#elif defined(NL_OS_MAC)
-#define RYZOM_SYSTEM "mac"
-#elif defined(NL_OS_UNIX)
-#define RYZOM_SYSTEM "unix"
-#else
-#define RYZOM_SYSTEM "unkown"
-#endif
-
-/*
-			char buffer[256];
-#ifdef REVISION
-			sprintf(buffer, "%s.%s-%s-%s", RYZOM_VERSION, REVISION, RYZOM_SYSTEM, RYZOM_ARCH);
-#else
-			sprintf(buffer, "%s-%s-%s", RYZOM_VERSION, RYZOM_SYSTEM, RYZOM_ARCH);
-#endif
-*/
-			
 			HTLib_setAppName( CGroupHTML::options.appName.c_str() );
 			HTLib_setAppVersion( CGroupHTML::options.appVersion.c_str() );
 

code/nel/src/gui/libwww_nel_stream.cpp

@@ -15,22 +15,23 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include <nel/misc/file.h>
 
 extern "C"
 {
 
 	/* Library Includes */
-#include "libwww/wwwsys.h"
+#include "wwwsys.h"
-#include "libwww/WWWUtil.h"
+#include "WWWUtil.h"
-#include "libwww/WWWCore.h"
+#include "WWWCore.h"
-#include "libwww/WWWDir.h"
+#include "WWWDir.h"
-#include "libwww/WWWTrans.h"
+#include "WWWTrans.h"
-#include "libwww/HTReqMan.h"
+#include "HTReqMan.h"
-#include "libwww/HTBind.h"
+#include "HTBind.h"
-#include "libwww/HTMulti.h"
+#include "HTMulti.h"
-#include "libwww/HTNetMan.h"
+#include "HTNetMan.h"
-#include "libwww/HTChannl.h"
+#include "HTChannl.h"
 #include "nel/gui/libwww_nel_stream.h"		/* Implemented here */
 }
 

code/nel/src/gui/link_hack.cpp

@@ -1,3 +1,21 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+#include "stdpch.h"
 #include "nel/gui/dbview_bar3.h"
 #include "nel/gui/dbview_number.h"
 #include "nel/gui/dbview_quantity.h"

code/nel/src/gui/lua_helper.cpp

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
+#include "stdpch.h"
 #include "nel/gui/lua_helper.h"
 #include "nel/misc/file.h"