Merged default

code/CMakeLists.txt

@@ -41,6 +41,11 @@ 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)

code/CMakeModules/nel.cmake

@@ -600,22 +600,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)
@@ -791,16 +776,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
@@ -813,7 +790,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/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

@@ -6,13 +6,16 @@ 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} ${LIBWWW_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR} ${LIBWWW_INCLUDE_DIR})
 
 NL_ADD_LIB_SUFFIX(nelgui)
 
@@ -28,6 +31,10 @@ TARGET_LINK_LIBRARIES(  nelgui
 			${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"

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"

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"

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"

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"

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"

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"

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"

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"

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,8 +16,7 @@
 
 //#include <crtdbg.h>
 
-#define NOMINMAX
+#include "stdpch.h"
-
 #include "nel/gui/group_html.h"
 
 // LibWWW

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"

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"

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"

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"
 
 

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"

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"

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"

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,7 +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/>.
 
-#define NOMINMAX
+#include "stdpch.h"
 
 #include "nel/gui/group_html.h"
 
@@ -29,10 +29,6 @@ extern "C"
 #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,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include <nel/misc/file.h>
 
 extern "C"

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"
 

code/nel/src/gui/lua_ihm.cpp

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

code/nel/src/gui/lua_loadlib.c

@@ -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 <windows.h>
 #include <stdarg.h>
 #include "lua_loadlib.h"

code/nel/src/gui/lua_manager.cpp

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

code/nel/src/gui/lua_object.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_object.h"
 #include "nel/gui/lua_ihm.h"
 #include "nel/gui/lua_helper.h"

code/nel/src/gui/parser.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 <map>
 #include "nel/gui/interface_group.h"

code/nel/src/gui/proc.cpp

@@ -15,7 +15,9 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 #include "nel/gui/proc.h"
+
 #include "nel/misc/algo.h"
 
 using namespace NLMISC;

code/nel/src/gui/reflect.cpp

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

code/nel/src/gui/reflect_register.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/reflect_register.h"
 
 #include "nel/gui/interface_element.h"

code/nel/src/gui/stdpch.cpp

@@ -0,0 +1,17 @@
+// 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"

code/nel/src/gui/stdpch.h

@@ -0,0 +1,38 @@
+// 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/>.
+
+#ifndef NELGUI_H
+#define NELGUI_H
+
+#include <string>
+
+#include "nel/misc/types_nl.h"
+#include "nel/misc/algo.h"
+#include "nel/misc/factory.h"
+#include "nel/misc/bit_mem_stream.h"
+#include "nel/misc/i18n.h"
+#include "nel/misc/path.h"
+#include "nel/misc/file.h"
+#include "nel/misc/uv.h"
+#include "nel/misc/hierarchical_timer.h"
+
+#ifdef NL_OS_WINDOWS
+	#define NOMINMAX
+	#include <WinSock2.h>
+	#include <windows.h>
+#endif
+
+#endif

code/nel/src/gui/string_case.cpp

@@ -1,3 +1,20 @@
+// 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/string_case.h"
 
 namespace NLGUI

code/nel/src/gui/view_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/view_base.h"
 #include "nel/gui/interface_group.h"
 #include "nel/gui/widget_manager.h"

code/nel/src/gui/view_bitmap.cpp

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

code/nel/src/gui/view_bitmap_combo.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/view_bitmap_combo.h"
 #include "nel/misc/xml_auto_ptr.h"
 #include "nel/gui/db_manager.h"

code/nel/src/gui/view_link.cpp

@@ -14,9 +14,11 @@
 // 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/view_link.h"
+
 #include "nel/misc/bit_mem_stream.h"
 #include "nel/misc/i18n.h"
-#include "nel/gui/view_link.h"
 
 using namespace std;
 using namespace NLMISC;

code/nel/src/gui/view_pointer.cpp

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

code/nel/src/gui/view_pointer_base.cpp

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

code/nel/src/gui/view_polygon.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/view_polygon.h"
+
 #include "nel/gui/view_renderer.h"
 #include "nel/gui/interface_group.h"
 #include "nel/gui/widget_manager.h"

code/nel/src/gui/view_quad.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/view_quad.h"
+
 #include "nel/gui/interface_group.h"
 #include "nel/gui/widget_manager.h"
 

code/nel/src/gui/view_renderer.cpp

@@ -14,11 +14,13 @@
 // 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/view_renderer.h"
+
 #include "nel/misc/path.h"
 #include "nel/misc/file.h"
 #include "nel/misc/uv.h"
 #include "nel/misc/hierarchical_timer.h"
-#include "nel/gui/view_renderer.h"
 
 using namespace NLMISC;
 using namespace std;

code/nel/src/gui/view_text.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/bit_mem_stream.h"
 #include "nel/misc/i18n.h"
 

code/nel/src/gui/view_text_formated.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/view_text_formated.h"
 #include "nel/misc/xml_auto_ptr.h"
 #include "nel/misc/i18n.h"

code/nel/src/gui/view_text_id.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/db_manager.h"
 #include "nel/gui/view_text_id.h"
 #include "nel/misc/xml_auto_ptr.h"

code/nel/src/gui/view_text_id_formated.cpp

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

code/nel/src/gui/widget_manager.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/db_manager.h"
 #include "nel/gui/view_renderer.h"
 #include "nel/gui/widget_manager.h"

code/nel/src/misc/cdb.cpp

@@ -14,7 +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 "stdmisc.h"
 
 //////////////
 // Includes //

code/nel/src/misc/cdb_bank_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 "stdmisc.h"
 #include "nel/misc/cdb_bank_handler.h"
 
 namespace NLMISC{

code/nel/src/misc/cdb_branch.cpp

@@ -14,7 +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 "stdmisc.h"
 
 //#define TRACE_READ_DELTA
 //#define TRACE_WRITE_DELTA

code/nel/src/misc/cdb_branch_observing_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 "stdmisc.h"
 #include "nel/misc/cdb_branch_observing_handler.h"
 
 namespace NLMISC{

code/nel/src/misc/cdb_check_sum.cpp

@@ -14,8 +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 "stdmisc.h"
-
 #include "nel/misc/cdb_check_sum.h"
 
 

code/nel/src/misc/cdb_leaf.cpp

@@ -14,7 +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 "stdmisc.h"
 
 //#define TRACE_READ_DELTA
 //#define TRACE_WRITE_DELTA

code/nel/src/misc/cdb_manager.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 "stdmisc.h"
 #include "nel/misc/cdb_manager.h"
 
 namespace NLMISC{

code/nel/src/misc/sheet_id.cpp

@@ -393,7 +393,7 @@ void CSheetId::init(bool removeUnknownSheet)
 		nlwarning("SHEETID: Loading without known sound sheet id, please update sheet_id.bin with .sound sheets");
 		nlassert(_FileExtensions.size() == 1 << (NL_SHEET_ID_TYPE_BITS));
 		nlassert(_FileExtensions[a_NoSoundSheetType].empty());
-		_FileExtensions[a_NoSoundSheetType] == "sound";
+		_FileExtensions[a_NoSoundSheetType] = "sound";
 		_DevSheetIdToName.push_back(std::vector<std::string>());
 		_DevSheetIdToName[0].push_back("unknown.sound");
 		TSheetId id;

code/nel/src/misc/win_event_emitter.cpp

@@ -281,6 +281,9 @@ bool CWinEventEmitter::processMessage (HWND hWnd, uint32 msg, WPARAM wParam, LPA
 	case WM_DESTROY:
 		server->postEvent (new CEventDestroyWindow (this));
 		break;
+	case WM_CLOSE:
+		server->postEvent (new CEventCloseWindow (this));
+		return true;
 	case WM_DISPLAYCHANGE:
 		server->postEvent (new CEventDisplayChange (LOWORD(lParam), HIWORD(lParam), (uint)wParam, this));
 		break;

code/nel/tools/3d/object_viewer_qt/src/plugins/CMakeLists.txt

@@ -6,7 +6,11 @@ ADD_SUBDIRECTORY(log)
 ADD_SUBDIRECTORY(disp_sheet_id)
 ADD_SUBDIRECTORY(object_viewer)
 ADD_SUBDIRECTORY(georges_editor)
+
+IF(WITH_GUI)
 ADD_SUBDIRECTORY(gui_editor)
+ENDIF(WITH_GUI)
+
 ADD_SUBDIRECTORY(translation_manager)
 ADD_SUBDIRECTORY(bnp_manager)
 # Note: Temporarily disabled until development continues.

code/nelns/naming_service/naming_service.cpp

@@ -1139,7 +1139,7 @@ NLMISC_COMMAND (kill, "kill a service and send an unregister broadcast to other
 
 NLMISC_DYNVARIABLE(uint32, NbRegisteredServices, "display the number of service that are registered in naming service")
 {
-	if (get) *pointer = RegisteredServices.size();
+	if (get) *pointer = (uint32)RegisteredServices.size();
 }
 
 NLMISC_COMMAND( displayServiceInstances, "SIM: Display info on service instances", "" )

code/ryzom/client/src/cdb_synchronised.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 
 //#define TRACE_READ_DELTA
 //#define TRACE_WRITE_DELTA

code/ryzom/client/src/events_listener.cpp

@@ -90,6 +90,7 @@ void CEventsListener::addToServer(CEventServer& server)
 	server.addListener(EventKeyDownId,		this);
 	server.addListener(EventKeyUpId,		this);
 	server.addListener(EventDestroyWindowId,this);
+	server.addListener(EventCloseWindowId,	this);
 	server.addListener(EventSetFocusId,		this);
 	server.addListener(EventDisplayChangeId,	this);
 }// addToServer //
@@ -108,6 +109,7 @@ void CEventsListener::removeFromServer (CEventServer& server)
 	server.removeListener(EventKeyDownId,	this);
 	server.removeListener(EventKeyUpId,		this);
 	server.removeListener(EventDestroyWindowId,this);
+	server.removeListener(EventCloseWindowId,	this);
 	server.removeListener(EventSetFocusId,		this);
 }// removeFromServer //
 
@@ -141,6 +143,11 @@ void CEventsListener::operator()(const CEvent& event)
 		// kill process
 		exit(EXIT_SUCCESS);
 	}
+	// Window close button pressed.
+	if(event == EventCloseWindowId)
+	{
+		CAHManager::getInstance()->runActionHandler("enter_modal", NULL, "group=ui:interface:quit_dialog");
+	}
 	// Event from the Mouse (ANGLE)
 	if(event == EventGDMouseMove)
 	{

code/ryzom/client/src/interface_v3/action_handler_base.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 "action_handler_base.h"
 #include "action_handler_misc.h"