cegui: headers diff between 0.5.0 and 0.6.1 versions

	CEGUIBase.h	CEGUIBase.h

	skipping to change at line 48	skipping to change at line 48
	// bring in configuration options	// bring in configuration options
	#include "CEGUIConfig.h"	#include "CEGUIConfig.h"

	// add CEGUI version defines	// add CEGUI version defines
	#include "CEGUIVersion.h"	#include "CEGUIVersion.h"

	/*************************************************************************	/*************************************************************************
	Dynamic Library import / export control conditional	Dynamic Library import / export control conditional
	(Define CEGUIBASE_EXPORTS to export symbols, else they are imported)	(Define CEGUIBASE_EXPORTS to export symbols, else they are imported)
	*************************************************************************/	*************************************************************************/

	#if defined( __WIN32__ ) \|\| defined( _WIN32 )	#if (defined( __WIN32__ ) \|\| defined( _WIN32 )) && !defined(CEGUI_STATIC)
	# ifdef CEGUIBASE_EXPORTS	# ifdef CEGUIBASE_EXPORTS
	# define CEGUIEXPORT __declspec(dllexport)	# define CEGUIEXPORT __declspec(dllexport)
	# else	# else
	# define CEGUIEXPORT __declspec(dllimport)	# define CEGUIEXPORT __declspec(dllimport)
	# endif	# endif
	# define CEGUIPRIVATE	# define CEGUIPRIVATE
	#else	#else
	# define CEGUIEXPORT	# define CEGUIEXPORT
	# define CEGUIPRIVATE	# define CEGUIPRIVATE
	#endif	#endif

	skipping to change at line 162	skipping to change at line 162
	This macro is used throughout the library to ensure that elements ar e	This macro is used throughout the library to ensure that elements ar e
	kept at integer pixel positions on the display.	kept at integer pixel positions on the display.

	\param x	\param x
	Expression to be rounded to nearest whole number	Expression to be rounded to nearest whole number

	\return	\return
	\a x after having been rounded	\a x after having been rounded
	*/	*/
	#if defined(CEGUI_ALIGN_ELEMENTS_TO_PIXELS)	#if defined(CEGUI_ALIGN_ELEMENTS_TO_PIXELS)

	# define PixelAligned(x) ( (float)(int)(( x ) + 0.5f) )	# define PixelAligned(x) ( (float)(int)(( x ) + (( x ) > 0.0f ? 0.5f : -0.5f)) )
	#else	#else
	# define PixelAligned(x) ( x )	# define PixelAligned(x) ( x )
	#endif	#endif

	/*************************************************************************	/*************************************************************************
	Bring in forward references to all GUI base system classes	Bring in forward references to all GUI base system classes
	*************************************************************************/	*************************************************************************/
	#include "CEGUIForwardRefs.h"	#include "CEGUIForwardRefs.h"

	#endif // end of guard _CEGUIBase_h_	#endif // end of guard _CEGUIBase_h_

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	CEGUIConfig.h	CEGUIConfig.h

	skipping to change at line 66	skipping to change at line 66
	#ifndef CEGUI_DEFAULT_XMLPARSER	#ifndef CEGUI_DEFAULT_XMLPARSER
	# define CEGUI_DEFAULT_XMLPARSER ExpatParser	# define CEGUI_DEFAULT_XMLPARSER ExpatParser
	#endif	#endif

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// Set this to the default ImageCodec to be used.	// Set this to the default ImageCodec to be used.
	// CoronaImageCodec, DevILImageCodec, FreeImageImageCodec,	// CoronaImageCodec, DevILImageCodec, FreeImageImageCodec,
	// SILLYImageCodec, TGAImageCodec	// SILLYImageCodec, TGAImageCodec
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	#ifndef CEGUI_DEFAULT_IMAGE_CODEC	#ifndef CEGUI_DEFAULT_IMAGE_CODEC

	# define CEGUI_DEFAULT_IMAGE_CODEC TGAImageCodec	# define CEGUI_DEFAULT_IMAGE_CODEC SILLYImageCodec
		#endif

		//////////////////////////////////////////////////////////////////////////
		// The following are required to build the integrated copy of TinyXML.
		// If for some reason you decide you need to use an external version of
		// TinyXML, you can change these defines as required (you will also likely
		// need to set up some linker stuff as well).
		//////////////////////////////////////////////////////////////////////////
		// Main tiny xml header file
		#ifndef CEGUI_TINYXML_H
		# define CEGUI_TINYXML_H "ceguitinyxml/tinyxml.h"
		#endif
		// Namespace that contains TinyXML.
		#ifndef CEGUI_TINYXML_NAMESPACE
		# define CEGUI_TINYXML_NAMESPACE CEGUITinyXML
		#endif

		//////////////////////////////////////////////////////////////////////////
		// The following controls the version of Lua that is going to be used.
		// 50 is for Lua 5.0.x versions
		// 51 is for Lua 5.1.x versions (and above?)
		//////////////////////////////////////////////////////////////////////////
		#ifndef CEGUI_LUA_VER
		# define CEGUI_LUA_VER 51
	#endif	#endif

	#endif // defined(__APPLE__)	#endif // defined(__APPLE__)

	#endif // end of guard _CEGUIConfig_h_	#endif // end of guard _CEGUIConfig_h_

End of changes. 1 change blocks.
	1 lines changed or deleted	25 lines changed or added

	CEGUIEventArgs.h	CEGUIEventArgs.h

	skipping to change at line 57	skipping to change at line 57
	The \a handled field is used to signal whether an event was actually handled or not. While	The \a handled field is used to signal whether an event was actually handled or not. While
	the event system does not look at this value, code at a higher level can use it to determine	the event system does not look at this value, code at a higher level can use it to determine
	how far to propagate an event.	how far to propagate an event.
	*/	*/
	class CEGUIEXPORT EventArgs	class CEGUIEXPORT EventArgs
	{	{
	public:	public:
	/***************************************************************** ****	/***************************************************************** ****
	Construction	Construction
	****************************************************************** ***/	****************************************************************** ***/

	EventArgs(void) : handled(false) {}	EventArgs(void) : handled(false), d_hasWindow(false) {}
	virtual ~EventArgs(void) {}	virtual ~EventArgs(void) {}

	/***************************************************************** ****	/***************************************************************** ****
	Data members	Data members
	****************************************************************** ***/	****************************************************************** ***/
	bool handled; //!< handlers should set this to tru e if they handled the event, or false otherwise.	bool handled; //!< handlers should set this to tru e if they handled the event, or false otherwise.

		bool d_hasWindow; //!< Indicates if this event set has a parent w indow.
	};	};

	} // End of CEGUI namespace section	} // End of CEGUI namespace section

	#endif // end of guard _CEGUIEventArgs_h_	#endif // end of guard _CEGUIEventArgs_h_

End of changes. 2 change blocks.
	1 lines changed or deleted	2 lines changed or added

	CEGUIExceptions.h	CEGUIExceptions.h
	/***********************************************************************	/***********************************************************************

	filename: CEGUIExceptions.h	filename: CEGUIExceptions.h
	created: 20/2/2004	created: 20/2/2004
	author: Paul D Turner	author: Paul D Turner, Frederico Jeronimo (fjeronimo)


	purpose: Defines exceptions used within the system	purpose: Defines exceptions used within the system
	*************************************************************************/	*************************************************************************/
	/************************************************************************** *	/************************************************************************** *

	* Copyright (C) 2004 - 2006 Paul D Turner & The CEGUI Development Team	* Copyright (C) 2004 - 2007 Paul D Turner & The CEGUI Development Team
	*	*
	* Permission is hereby granted, free of charge, to any person obtaining	* Permission is hereby granted, free of charge, to any person obtaining
	* a copy of this software and associated documentation files (the	* a copy of this software and associated documentation files (the
	* "Software"), to deal in the Software without restriction, including	* "Software"), to deal in the Software without restriction, including
	* without limitation the rights to use, copy, modify, merge, publish,	* without limitation the rights to use, copy, modify, merge, publish,
	* distribute, sublicense, and/or sell copies of the Software, and to	* distribute, sublicense, and/or sell copies of the Software, and to
	* permit persons to whom the Software is furnished to do so, subject to	* permit persons to whom the Software is furnished to do so, subject to
	* the following conditions:	* the following conditions:
	*	*
	* The above copyright notice and this permission notice shall be	* The above copyright notice and this permission notice shall be
	* included in all copies or substantial portions of the Software.	* included in all copies or substantial portions of the Software.
	*	*
	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF	* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
	* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.	* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
	* IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR	* IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
	* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,	* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
	* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR	* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
	* OTHER DEALINGS IN THE SOFTWARE.	* OTHER DEALINGS IN THE SOFTWARE.
	**************************************************************************	***************************************************************************
	*/	/
	#ifndef _CEGUIExceptions_h_	#ifndef _CEGUIExceptions_h_
	#define _CEGUIExceptions_h_	#define _CEGUIExceptions_h_


		//////////////////////////////////////////////////////////////////////////
		// INCLUDES
		//////////////////////////////////////////////////////////////////////////

	#include "CEGUIBase.h"	#include "CEGUIBase.h"
	#include "CEGUIString.h"	#include "CEGUIString.h"


		//////////////////////////////////////////////////////////////////////////
		// CEGUI NAMESPACE
		//////////////////////////////////////////////////////////////////////////

	// Start of CEGUI namespace section	// Start of CEGUI namespace section
	namespace CEGUI	namespace CEGUI
	{	{

	/*!	///////////////////////////////////////////////////////////////////////
	\brief	///
	Root exception class used within the GUI system.	// EXCEPTION
	*/	///////////////////////////////////////////////////////////////////////
	class CEGUIEXPORT Exception	///
	{
	public:
	/*******************************************************************
	******
	Construction and Destruction
	********************************************************************
	*****/
	Exception(const String& message);
	virtual ~Exception(void);


	/*!	/*!
	\brief	\brief
	Return a reference to the String object describing the reaso	Root exception class used within the GUI system.
	n for the exception being thrown.	*/
		class CEGUIEXPORT Exception
		{


	\return	public:
	String object containing a message describing the reason for	/******************************************************************
	the exception.	*****
	*/	* DESTRUCTOR
	const String& getMessage(void) const {return d_message;}	******************************************************************
		****/
		/*!
		\brief
		Virtual destructor.
		*/
		virtual ~Exception(void);


	protected:	/******************************************************************
	String d_message;	*****
	};	* PUBLIC FUNCTIONS
		******************************************************************
		****/


	/*!	/*!
	\brief	\brief
	Exception class used when none of the other classes are applicable	Return a reference to the String object describing the reason for t
	*/	he exception being thrown.
	class CEGUIEXPORT GenericException : public Exception
	{
	public:
	/*******************************************************************
	******
	Construction and Destruction
	********************************************************************
	*****/
	GenericException(const String& message) : Exception(message) {}
	};


	/*!	\return
	\brief	String object containing a message describing the reason for the ex
	Exception class used when a request was made using a name of an unkn	ception.
	own object	*/
	*/	const String& getMessage(void) const {return d_message;}
	class CEGUIEXPORT UnknownObjectException : public Exception
	{
	public:
	/*******************************************************************
	******
	Construction and Destruction
	********************************************************************
	*****/
	UnknownObjectException(const String& message) : Exception(message) {
	}
	};


	/*!	/*!
	\brief	\brief
	Exception class used when some impossible request was made for the c	Return a reference to the String object containing the exception na
	urrent system state	me (i.e. class type).
	*/
	class CEGUIEXPORT InvalidRequestException : public Exception
	{
	public:
	/*******************************************************************
	******
	Construction and Destruction
	********************************************************************
	*****/
	InvalidRequestException(const String& message) : Exception(message)
	{}
	};


	/*!	\return
	\brief	String object containing the exception name.
	Exception class used when a file handling problem occurs	*/
	*/	const String& getName() const { return d_name; }
	class CEGUIEXPORT FileIOException : public Exception
	{
	public:
	/*******************************************************************
	******
	Construction and Destruction
	********************************************************************
	*****/
	FileIOException(const String& message) : Exception(message) {}
	};


	/*!	/*!
	\brief	\brief
	Exception class used when an problem is detected within the Renderer	Return a reference to the String object containing the name of the
	or related objects	file where the exception occurred.
	*/
	class CEGUIEXPORT RendererException : public Exception
	{
	public:
	/*******************************************************************
	******
	Construction and Destruction
	********************************************************************
	*****/
	RendererException(const String& message) : Exception(message) {}
	};


	/*!	\return
	\brief	String object containing the name of the file where the exception o
	Exception class used when an attempt is made to use an object name t	ccurred.
	hat is already in use within the system	*/
	*/	const String& getFileName(void) const {return d_filename;}
	class CEGUIEXPORT AlreadyExistsException : public Exception
	{
	public:
	/*******************************************************************
	******
	Construction and Destruction
	********************************************************************
	*****/
	AlreadyExistsException(const String& message) : Exception(message) {
	}
	};


	/*!	/*!
	\brief	\brief
	Exception class used when a memory handling error is detected	Return the line number where the exception occurred.
	*/
	class CEGUIEXPORT MemoryException : public Exception
	{
	public:
	/*******************************************************************
	******
	Construction and Destruction
	********************************************************************
	*****/
	MemoryException(const String& message) : Exception(message) {}
	};


	/*!	\Return
	\brief	Integer representing the line number where the exception occurred.
	Exception class used when some required object or parameter is null	*/
	*/	const int getLine(void) const {return d_line;}
	class CEGUIEXPORT NullObjectException : public Exception
	{
	public:
	/*******************************************************************
	******
	Construction and Destruction
	********************************************************************
	*****/
	NullObjectException(const String& message) : Exception(message) {}
	};


	/*!	protected:
	\brief
	Exception class used when some attempt to delete, remove, or otherwi
	se invalidate some object that is still in use occurs.
	*/
	class CEGUIEXPORT ObjectInUseException : public Exception
	{
	public:
	/*******************************************************************
	******
	Construction and Destruction
	********************************************************************
	*****/
	ObjectInUseException(const String& message) : Exception(message) {}
	};


	/*!	/******************************************************************
	\brief	*****
		* CONSTRUCTORS
		******************************************************************
		****/

		/*!
		\brief
		Protected constructor that prevents instantiations (users should em
		ploy derived
		exception classes instead) and that is responsible for logging the
		exception.

		\param message
		String object describing the reason for the exception being thrown.

		\param name
		String object describing the exception class name (e.g. CEGUI::Unkn
		ownObjectException)

		\param filename
		String object containing the name of the file where the exception o
		ccurred.

		\param line
		Integer representing the line number where the exception occurred.
		*/
		Exception(const String& message = "", const String& name ="CEGUI::E
		xception", const String& filename = "", int line = 0);

		/******************************************************************
		*****
		* PROTECTED VARIABLES
		******************************************************************
		****/

		/*!
		\brief
		Holds the reason for the exception being thrown.
		*/
		String d_message;

		/*!
		\brief
		Holds the name of the file where the exception occurred.
		*/
		String d_filename;

		/*!
		\brief
		Holds the class name of the exception (e.g. CEGUI::ObjectInUseExcep
		tion)
		*/
		String d_name;

		/*!
		\brief
		Holds the line number where the exception occurred.
		*/
		int d_line;
		};

		///////////////////////////////////////////////////////////////////////
		///
		// GENERIC EXCEPTION
		///////////////////////////////////////////////////////////////////////
		///

		/*!
		\brief
		Exception class used when none of the other classes are applicable
		*/
		class CEGUIEXPORT GenericException : public Exception
		{
		public:

		/******************************************************************
		*****
		* CONSTRUCTORS/DESTRUCTORS
		******************************************************************
		****/

		/*!
		\brief
		Constructor that is responsible for logging the generic exception b
		y calling
		the base class.

		\param message
		String object describing the reason for the generic exception being
		thrown.

		\param filename
		String object containing the name of the file where the generic exc
		eption occurred.

		\param line
		Integer representing the line number where the generic exception oc
		curred.

		\remarks
		The generic exception name is automatically passed to the base clas
		s as
		"CEGUI::GenericException".
		*/
		GenericException(const String& message, const String& file = "unkno
		wn", int line = 0)
		: Exception(message, "CEGUI::GenericException", file, line) {}
		};

		/*!
		\brief
		This helper macro ensures the correct filename and line number where th
		e generic
		exception occurred are passed to the exception itself.

		\remarks
		There's a bug in Visual Studio 7.1 (see http://support.microsoft.com/kb
		/199057/en)
		and lower which leads to incorrect __LINE__ macro expansion if used ins
		ide a
		function and compiled with "Program Database for Edit & Continue" (/ZI)
		where
		instead of a constant expressing line number you'll get the
		following: (__LINE__Var+constant). The workaround consists in using com
		piler
		option "Program Database" (/Zi) instead
		--> Project Properties\C/C++\General\Debug Information Format\Program D
		atabase (/Zi).
		Visual Studio 2005 corrects the problem. Premake files were
		modified to contemplate this for VS2002 and VS2003.
		*/
		#define GenericException(message) \
		GenericException(message, __FILE__, __LINE__)

		///////////////////////////////////////////////////////////////////////
		///
		// UNKNOWN OBJECT EXCEPTION
		///////////////////////////////////////////////////////////////////////
		///

		/*!
		\brief
		Exception class used when a request was made using a name of an unknown
		object
		*/
		class CEGUIEXPORT UnknownObjectException : public Exception
		{
		public:

		/******************************************************************
		*****
		* CONSTRUCTORS/DESTRUCTORS
		******************************************************************
		****/

		/*!
		\brief
		Constructor that is responsible for logging the unknown object exce
		ption by calling
		the base class.

		\param message
		String object describing the reason for the unknown object exceptio
		n being thrown.

		\param filename
		String object containing the name of the file where the unknown obj
		ect exception occurred.

		\param line
		Integer representing the line number where the unknown object excep
		tion occurred.

		\remarks
		The unknown object exception name is automatically passed to the ba
		se class as
		"CEGUI::UnknownObjectException".
		*/
		UnknownObjectException(const String& message, const String& file =
		"unknown", int line = 0)
		: Exception(message, "CEGUI::UnknownObjectException", file, lin
		e) {}
		};

		/*!
		\brief
		This helper macro ensures the correct filename and line number where th
		e unknown object
		exception occurred are passed to the exception itself.

		\remarks
		There's a bug in Visual Studio 7.1 (see http://support.microsoft.com/kb
		/199057/en)
		and lower which leads to incorrect __LINE__ macro expansion if used ins
		ide a
		function and compiled with "Program Database for Edit & Continue" (/ZI)
		where
		instead of a constant expressing line number you'll get the
		following: (__LINE__Var+constant). The workaround consists in using com
		piler
		option "Program Database" (/Zi) instead
		--> Project Properties\C/C++\General\Debug Information Format\Program D
		atabase (/Zi).
		Visual Studio 2005 corrects the problem. Premake files were
		modified to contemplate this for VS2002 and VS2003.
		*/
		#define UnknownObjectException(message) \
		UnknownObjectException(message, __FILE__, __LINE__)

		///////////////////////////////////////////////////////////////////////
		///
		// INVALID REQUEST EXCEPTION
		///////////////////////////////////////////////////////////////////////
		///

		/*!
		\brief
		Exception class used when some impossible request was made for the curr
		ent system state
		*/
		class CEGUIEXPORT InvalidRequestException : public Exception
		{
		public:

		/******************************************************************
		*****
		* CONSTRUCTORS/DESTRUCTORS
		******************************************************************
		****/

		/*!
		\brief
		Constructor that is responsible for logging the invalid request exc
		eption by calling
		the base class.

		\param message
		String object describing the reason for the invalid request excepti
		on being thrown.

		\param filename
		String object containing the name of the file where the invalid req
		uest exception occurred.

		\param line
		Integer representing the line number where the invalid request exce
		ption occurred.

		\remarks
		The invalid request exception name is automatically passed to the b
		ase class as
		"CEGUI::InvalidRequestException".
		*/
		InvalidRequestException(const String& message, const String& file =
		"unknown", int line = 0)
		: Exception(message, "CEGUI::InvalidRequestException", file, li
		ne) {}
		};

		/*!
		\brief
		This helper macro ensures the correct filename and line number where th
		e invalid request
		exception occurred are passed to the exception itself.

		\remarks
		There's a bug in Visual Studio 7.1 (see http://support.microsoft.com/kb
		/199057/en)
		and lower which leads to incorrect __LINE__ macro expansion if used ins
		ide a
		function and compiled with "Program Database for Edit & Continue" (/ZI)
		where
		instead of a constant expressing line number you'll get the
		following: (__LINE__Var+constant). The workaround consists in using com
		piler
		option "Program Database" (/Zi) instead
		--> Project Properties\C/C++\General\Debug Information Format\Program D
		atabase (/Zi).
		Visual Studio 2005 corrects the problem. Premake files were
		modified to contemplate this for VS2002 and VS2003.
		*/
		#define InvalidRequestException(message) \
		InvalidRequestException(message, __FILE__, __LINE__)

		///////////////////////////////////////////////////////////////////////
		///
		// FILE IO EXCEPTION
		///////////////////////////////////////////////////////////////////////
		///

		/*!
		\brief
		Exception class used when a file handling problem occurs
		*/
		class CEGUIEXPORT FileIOException : public Exception
		{
		public:

		/******************************************************************
		*****
		* CONSTRUCTORS/DESTRUCTORS
		******************************************************************
		****/

		/*!
		\brief
		Constructor that is responsible for logging the file IO exception b
		y calling
		the base class.

		\param message
		String object describing the reason for the file IO exception being
		thrown.

		\param filename
		String object containing the name of the file where the file IO exc
		eption occurred.

		\param line
		Integer representing the line number where the file IO exception oc
		curred.

		\remarks
		The file IO exception name is automatically passed to the base clas
		s as
		"CEGUI::FileIOException".
		*/
		FileIOException(const String& message, const String& file = "unknow
		n", int line = 0)
		: Exception(message, "CEGUI::FileIOException", file, line) {}
		};

		/*!
		\brief
		This helper macro ensures the correct filename and line number where th
		e file IO
		exception occurred are passed to the exception itself.

		\remarks
		There's a bug in Visual Studio 7.1 (see http://support.microsoft.com/kb
		/199057/en)
		and lower which leads to incorrect __LINE__ macro expansion if used ins
		ide a
		function and compiled with "Program Database for Edit & Continue" (/ZI)
		where
		instead of a constant expressing line number you'll get the
		following: (__LINE__Var+constant). The workaround consists in using com
		piler
		option "Program Database" (/Zi) instead
		--> Project Properties\C/C++\General\Debug Information Format\Program D
		atabase (/Zi).
		Visual Studio 2005 corrects the problem. Premake files were
		modified to contemplate this for VS2002 and VS2003.
		*/
		#define FileIOException(message) \
		FileIOException(message, __FILE__, __LINE__)

		///////////////////////////////////////////////////////////////////////
		///
		// RENDERER EXCEPTION
		///////////////////////////////////////////////////////////////////////
		///

		/*!
		\brief
		Exception class used when an problem is detected within the Renderer or
		related objects
		*/
		class CEGUIEXPORT RendererException : public Exception
		{
		public:

		/******************************************************************
		*****
		* CONSTRUCTORS/DESTRUCTORS
		******************************************************************
		****/

		/*!
		\brief
		Constructor that is responsible for logging the renderer exception
		by calling
		the base class.

		\param message
		String object describing the reason for the renderer exception bein
		g thrown.

		\param filename
		String object containing the name of the file where the renderer ex
		ception occurred.

		\param line
		Integer representing the line number where the renderer exception o
		ccurred.

		\remarks
		The renderer exception name is automatically passed to the base cla
		ss as
		"CEGUI::RendererException".
		*/
		RendererException(const String& message, const String& file = "unkn
		own", int line = 0)
		: Exception(message, "CEGUI::RendererException", file, line) {}
		};

		/*!
		\brief
		This helper macro ensures the correct filename and line number where th
		e renderer
		exception occurred are passed to the exception itself.

		\remarks
		There's a bug in Visual Studio 7.1 (see http://support.microsoft.com/kb
		/199057/en)
		and lower which leads to incorrect __LINE__ macro expansion if used ins
		ide a
		function and compiled with "Program Database for Edit & Continue" (/ZI)
		where
		instead of a constant expressing line number you'll get the
		following: (__LINE__Var+constant). The workaround consists in using com
		piler
		option "Program Database" (/Zi) instead
		--> Project Properties\C/C++\General\Debug Information Format\Program D
		atabase (/Zi).
		Visual Studio 2005 corrects the problem. Premake files were
		modified to contemplate this for VS2002 and VS2003.
		*/
		#define RendererException(message) \
		RendererException(message, __FILE__, __LINE__)

		///////////////////////////////////////////////////////////////////////
		///
		// ALREADY EXISTS EXCEPTION
		///////////////////////////////////////////////////////////////////////
		///

		/*!
		\brief
		Exception class used when an attempt is made to use an object name that
		is already in use within the system
		*/
		class CEGUIEXPORT AlreadyExistsException : public Exception
		{
		public:

		/******************************************************************
		*****
		* CONSTRUCTORS/DESTRUCTORS
		******************************************************************
		****/

		/*!
		\brief
		Constructor that is responsible for logging the already exists exce
		ption by calling
		the base class.

		\param message
		String object describing the reason for the already exists exceptio
		n being thrown.

		\param filename
		String object containing the name of the file where the already exi
		sts exception occurred.

		\param line
		Integer representing the line number where the already exists excep
		tion occurred.

		\remarks
		The already exists exception name is automatically passed to the ba
		se class as
		"CEGUI::AlreadyExistsException".
		*/
		AlreadyExistsException(const String& message, const String& file =
		"unknown", int line = 0)
		: Exception(message, "CEGUI::AlreadyExistsException", file, lin
		e) {}
		};

		/*!
		\brief
		This helper macro ensures the correct filename and line number where th
		e already exists
		exception occurred are passed to the exception itself.

		\remarks
		There's a bug in Visual Studio 7.1 (see http://support.microsoft.com/kb
		/199057/en)
		and lower which leads to incorrect __LINE__ macro expansion if used ins
		ide a
		function and compiled with "Program Database for Edit & Continue" (/ZI)
		where
		instead of a constant expressing line number you'll get the
		following: (__LINE__Var+constant). The workaround consists in using com
		piler
		option "Program Database" (/Zi) instead
		--> Project Properties\C/C++\General\Debug Information Format\Program D
		atabase (/Zi).
		Visual Studio 2005 corrects the problem. Premake files were
		modified to contemplate this for VS2002 and VS2003.
		*/
		#define AlreadyExistsException(message) \
		AlreadyExistsException(message, __FILE__, __LINE__)

		///////////////////////////////////////////////////////////////////////
		///
		// MEMORY EXCEPTION
		///////////////////////////////////////////////////////////////////////
		///

		/*!
		\brief
		Exception class used when a memory handling error is detected
		*/
		class CEGUIEXPORT MemoryException : public Exception
		{
		public:

		/******************************************************************
		*****
		* CONSTRUCTORS/DESTRUCTORS
		******************************************************************
		****/

		/*!
		\brief
		Constructor that is responsible for logging the memory exception by
		calling
		the base class.

		\param message
		String object describing the reason for the memory exception being
		thrown.

		\param filename
		String object containing the name of the file where the memory exce
		ption occurred.

		\param line
		Integer representing the line number where the memory exception occ
		urred.

		\remarks
		The memory exception name is automatically passed to the base class
		as
		"CEGUI::MemoryException".
		*/
		MemoryException(const String& message, const String& file = "unknow
		n", int line = 0)
		: Exception(message, "CEGUI::MemoryException", file, line) {}
		};

		/*!
		\brief
		This helper macro ensures the correct filename and line number where th
		e memory
		exception occurred are passed to the exception itself.

		\remarks
		There's a bug in Visual Studio 7.1 (see http://support.microsoft.com/kb
		/199057/en)
		and lower which leads to incorrect __LINE__ macro expansion if used ins
		ide a
		function and compiled with "Program Database for Edit & Continue" (/ZI)
		where
		instead of a constant expressing line number you'll get the
		following: (__LINE__Var+constant). The workaround consists in using com
		piler
		option "Program Database" (/Zi) instead
		--> Project Properties\C/C++\General\Debug Information Format\Program D
		atabase (/Zi).
		Visual Studio 2005 corrects the problem. Premake files were
		modified to contemplate this for VS2002 and VS2003.
		*/
		#define MemoryException(message) \
		MemoryException(message, __FILE__, __LINE__)

		///////////////////////////////////////////////////////////////////////
		///
		// NULL OBJECT EXCEPTION
		///////////////////////////////////////////////////////////////////////
		///

		/*!
		\brief
		Exception class used when some required object or parameter is null
		*/
		class CEGUIEXPORT NullObjectException : public Exception
		{
		public:

		/******************************************************************
		*****
		* CONSTRUCTORS/DESTRUCTORS
		******************************************************************
		****/

		/*!
		\brief
		Constructor that is responsible for logging the null object excepti
		on by calling
		the base class.

		\param message
		String object describing the reason for the null object exception b
		eing thrown.

		\param filename
		String object containing the name of the file where the null object
		exception occurred.

		\param line
		Integer representing the line number where the null object exceptio
		n occurred.

		\remarks
		The null object exception name is automatically passed to the base
		class as
		"CEGUI::NullObjectException".
		*/
		NullObjectException(const String& message, const String& file = "un
		known", int line = 0)
		: Exception(message, "CEGUI::NullObjectException", file, line)
		{}
		};

		/*!
		\brief
		This helper macro ensures the correct filename and line number where th
		e null object
		exception occurred are passed to the exception itself.

		\remarks
		There's a bug in Visual Studio 7.1 (see http://support.microsoft.com/kb
		/199057/en)
		and lower which leads to incorrect __LINE__ macro expansion if used ins
		ide a
		function and compiled with "Program Database for Edit & Continue" (/ZI)
		where
		instead of a constant expressing line number you'll get the
		following: (__LINE__Var+constant). The workaround consists in using com
		piler
		option "Program Database" (/Zi) instead
		--> Project Properties\C/C++\General\Debug Information Format\Program D
		atabase (/Zi).
		Visual Studio 2005 corrects the problem. Premake files were
		modified to contemplate this for VS2002 and VS2003.
		*/
		#define NullObjectException(message) \
		NullObjectException(message, __FILE__, __LINE__)

		///////////////////////////////////////////////////////////////////////
		///
		// OBJECT IN USE EXCEPTION
		///////////////////////////////////////////////////////////////////////
		///

		/*!
		\brief
		Exception class used when some attempt to delete, remove, or otherwise
		invalidate some object that is still in use occurs.
		*/
		class CEGUIEXPORT ObjectInUseException : public Exception
		{
		public:

		/******************************************************************
		*****
		* CONSTRUCTORS/DESTRUCTORS
		******************************************************************
		****/

		/*!
		\brief
		Constructor that is responsible for logging the object in use excep
		tion by calling
		the base class.

		\param message
		String object describing the reason for the object in use exception
		being thrown.

		\param filename
		String object containing the name of the file where the object in u
		se exception occurred.

		\param line
		Integer representing the line number where the object in use except
		ion occurred.

		\remarks
		The object in use exception name is automatically passed to the bas
		e class as
		"CEGUI::ObjectInUseException".
		*/
		ObjectInUseException(const String& message, const String& file = "u
		nknown", int line = 0)
		: Exception(message, "CEGUI::ObjectInUseException", file, line)
		{}
		};

		/*!
		\brief
		This helper macro ensures the correct filename and line number where th
		e object in use
		exception occurred are passed to the exception itself.

		\remarks
		There's a bug in Visual Studio 7.1 (see http://support.microsoft.com/kb
		/199057/en)
		and lower which leads to incorrect __LINE__ macro expansion if used ins
		ide a
		function and compiled with "Program Database for Edit & Continue" (/ZI)
		where
		instead of a constant expressing line number you'll get the
		following: (__LINE__Var+constant). The workaround consists in using com
		piler
		option "Program Database" (/Zi) instead
		--> Project Properties\C/C++\General\Debug Information Format\Program D
		atabase (/Zi).
		Visual Studio 2005 corrects the problem. Premake files were
		modified to contemplate this for VS2002 and VS2003.
		*/
		#define ObjectInUseException(message) \
		ObjectInUseException(message, __FILE__, __LINE__)

		///////////////////////////////////////////////////////////////////////
		///
		// SCRIPT EXCEPTION
		///////////////////////////////////////////////////////////////////////
		///

		/*!
		\brief
	Exception class used when a scripting error occurs	Exception class used when a scripting error occurs

	*/	*/
	class CEGUIEXPORT ScriptException : public Exception	class CEGUIEXPORT ScriptException : public Exception
	{	{
	public:	public:
	/*******************************************************************
	******	/******************************************************************
	Construction and Destruction	*****
	********************************************************************	* CONSTRUCTORS/DESTRUCTORS
	*****/	******************************************************************
	ScriptException(const String& message) : Exception(message) {}	****/
	};
		/*!
		\brief
		Constructor that is responsible for logging the script exception by
		calling
		the base class.

		\param message
		String object describing the reason for the script exception being
		thrown.

		\param filename
		String object containing the name of the file where the script exce
		ption occurred.

		\param line
		Integer representing the line number where the script exception occ
		urred.

		\remarks
		The script exception name is automatically passed to the base class
		as
		"CEGUI::ScriptException".
		*/
		ScriptException(const String& message, const String& file = "unknow
		n", int line = 0)
		: Exception(message, "CEGUI::ScriptException", file, line) {}
		};

		/*!
		\brief
		This helper macro ensures the correct filename and line number where th
		e script
		exception occurred are passed to the exception itself.

		\remarks
		There's a bug in Visual Studio 7.1 (see http://support.microsoft.com/kb
		/199057/en)
		and lower which leads to incorrect __LINE__ macro expansion if used ins
		ide a
		function and compiled with "Program Database for Edit & Continue" (/ZI)
		where
		instead of a constant expressing line number you'll get the
		following: (__LINE__Var+constant). The workaround consists in using com
		piler
		option "Program Database" (/Zi) instead
		--> Project Properties\C/C++\General\Debug Information Format\Program D
		atabase (/Zi).
		Visual Studio 2005 corrects the problem. Premake files were
		modified to contemplate this for VS2002 and VS2003.
		*/
		#define ScriptException(message) \
		ScriptException(message, __FILE__, __LINE__)

	} // End of CEGUI namespace section	} // End of CEGUI namespace section

	#endif // end of guard _CEGUIExceptions_h_	#endif // end of guard _CEGUIExceptions_h_

End of changes. 20 change blocks.
	199 lines changed or deleted	895 lines changed or added

	CEGUIExpatParser.h	CEGUIExpatParser.h

	skipping to change at line 33	skipping to change at line 33
	* IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR	* IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
	* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,	* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
	* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR	* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
	* OTHER DEALINGS IN THE SOFTWARE.	* OTHER DEALINGS IN THE SOFTWARE.
	************************************************************************** */	************************************************************************** */
	#ifndef _CEGUIExpatParser_h_	#ifndef _CEGUIExpatParser_h_
	#define _CEGUIExpatParser_h_	#define _CEGUIExpatParser_h_

	#include "CEGUIXMLParser.h"	#include "CEGUIXMLParser.h"


	#if defined( __WIN32__ ) \|\| defined( _WIN32 )	#if (defined( __WIN32__ ) \|\| defined( _WIN32 )) && !defined(CEGUI_STATIC)
	# ifdef CEGUIEXPATPARSER_EXPORTS	# ifdef CEGUIEXPATPARSER_EXPORTS
	# define CEGUIEXPATPARSER_API __declspec(dllexport)	# define CEGUIEXPATPARSER_API __declspec(dllexport)
	# else	# else
	# define CEGUIEXPATPARSER_API __declspec(dllimport)	# define CEGUIEXPATPARSER_API __declspec(dllimport)
	# endif	# endif
	#else	#else
	# define CEGUIEXPATPARSER_API	# define CEGUIEXPATPARSER_API
	#endif	#endif

	// Start of CEGUI namespace section	// Start of CEGUI namespace section

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	CEGUIFactoryModule.h	CEGUIFactoryModule.h

	skipping to change at line 102	skipping to change at line 102
	Implementation Data	Implementation Data
	****************************************************************** ***/	****************************************************************** ***/
	static const char RegisterFactoryFunctionName[];	static const char RegisterFactoryFunctionName[];
	static const char RegisterAllFunctionName[];	static const char RegisterAllFunctionName[];

	typedef void (*FactoryRegisterFunction)(const String&);	typedef void (*FactoryRegisterFunction)(const String&);
	typedef uint (*RegisterAllFunction)(void);	typedef uint (*RegisterAllFunction)(void);

	FactoryRegisterFunction d_regFunc; //!< Pointer to the function called to register factories.	FactoryRegisterFunction d_regFunc; //!< Pointer to the function called to register factories.
	RegisterAllFunction d_regAllFunc; //!< Pointer to a function called t o register all factories in a module.	RegisterAllFunction d_regAllFunc; //!< Pointer to a function called t o register all factories in a module.

	DynamicModule d_module;	DynamicModule* d_module;
	};	};

	} // End of CEGUI namespace section	} // End of CEGUI namespace section

	#endif // end of guard _CEGUIFactoryModule_h_	#endif // end of guard _CEGUIFactoryModule_h_

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	CEGUIFalWidgetLookFeel.h	CEGUIFalWidgetLookFeel.h

	skipping to change at line 351	skipping to change at line 351
	/*!	/*!
	\brief	\brief
	Takes the namesuffix for a widget component and returns a point er to	Takes the namesuffix for a widget component and returns a point er to
	it if it exists or 0 if it does'nt.	it if it exists or 0 if it does'nt.

	\param nameSuffix	\param nameSuffix
	The name suffix of the Child component to look for.	The name suffix of the Child component to look for.
	*/	*/
	const WidgetComponent* findWidgetComponent(const String& nameSuffix ) const;	const WidgetComponent* findWidgetComponent(const String& nameSuffix ) const;


		/** Typedefs for property related lists. */
		typedef std::vector<PropertyInitialiser> PropertyList;
		typedef std::vector<PropertyDefinition> PropertyDefinitionList;
		typedef std::vector<PropertyLinkDefinition> PropertyLinkDefinitionL
		ist;

		/** Obtains list of properties definitions.
		* @access public
		* @return CEGUI::WidgetLookFeel::PropertyDefinitionList List of pr
		operties definitions
		*/
		const PropertyDefinitionList& getPropertyDefinitions() const { retu
		rn d_propertyDefinitions; }

		/** Obtains list of properties link definitions.
		* @access public
		* @return CEGUI::WidgetLookFeel::PropertyLinkDefinitionList List o
		f properties link definitions
		*/
		const PropertyLinkDefinitionList& getPropertyLinkDefinitions() cons
		t { return d_propertyLinkDefinitions; }

		/** Obtains list of properties.
		* @access public
		* @return CEGUI::WidgetLookFeel::PropertyList List of properties
		*/
		const PropertyList& getProperties() const { return d_properties; }

	private:	private:
	typedef std::map<String, StateImagery, String::FastLessCompare> StateList;	typedef std::map<String, StateImagery, String::FastLessCompare> StateList;
	typedef std::map<String, ImagerySection, String::FastLessCompare> ImageryList;	typedef std::map<String, ImagerySection, String::FastLessCompare> ImageryList;
	typedef std::map<String, NamedArea, String::FastLessCompare> NamedAreaList;	typedef std::map<String, NamedArea, String::FastLessCompare> NamedAreaList;
	typedef std::vector<WidgetComponent> WidgetList;	typedef std::vector<WidgetComponent> WidgetList;

	typedef std::vector<PropertyInitialiser> PropertyList;
	typedef std::vector<PropertyDefinition> PropertyDefinitionList;
	typedef std::vector<PropertyLinkDefinition> PropertyLinkDefinitionL
	ist;

	CEGUI::String d_lookName; //!< Name of this WidgetLookFee l.	CEGUI::String d_lookName; //!< Name of this WidgetLookFee l.
	ImageryList d_imagerySections; //!< Collection of ImagerySecti on objects.	ImageryList d_imagerySections; //!< Collection of ImagerySecti on objects.
	WidgetList d_childWidgets; //!< Collection of WidgetCompon ent objects.	WidgetList d_childWidgets; //!< Collection of WidgetCompon ent objects.
	StateList d_stateImagery; //!< Collection of StateImagery objects.	StateList d_stateImagery; //!< Collection of StateImagery objects.
	PropertyList d_properties; //!< Collection of PropertyInit ialser objects.	PropertyList d_properties; //!< Collection of PropertyInit ialser objects.
	NamedAreaList d_namedAreas; //!< Collection of NamedArea ob jects.	NamedAreaList d_namedAreas; //!< Collection of NamedArea ob jects.
	mutable PropertyDefinitionList d_propertyDefinitions; //!< Collec tion of PropertyDefinition objects.	mutable PropertyDefinitionList d_propertyDefinitions; //!< Collec tion of PropertyDefinition objects.
	mutable PropertyLinkDefinitionList d_propertyLinkDefinitions; //!< Collection of PropertyLinkDefinition objects.	mutable PropertyLinkDefinitionList d_propertyLinkDefinitions; //!< Collection of PropertyLinkDefinition objects.
	};	};

End of changes. 2 change blocks.
	4 lines changed or deleted	28 lines changed or added

	CEGUIForwardRefs.h	CEGUIForwardRefs.h

	skipping to change at line 65	skipping to change at line 65
	class EventArgs;	class EventArgs;
	class Event;	class Event;
	class EventSet;	class EventSet;
	class Property;	class Property;
	class PropertySet;	class PropertySet;
	class Window;	class Window;
	class WindowFactory;	class WindowFactory;
	class WindowManager;	class WindowManager;
	class Scheme;	class Scheme;
	class SchemeManager;	class SchemeManager;

		class ScriptWindowHelper;
	class System;	class System;
	class FactoryModule;	class FactoryModule;
	class ScriptModule;	class ScriptModule;
	class ResourceProvider;	class ResourceProvider;
	class DefaultResourceProvider;	class DefaultResourceProvider;
	class DynamicModule;	class DynamicModule;
	class PropertyReceiver;	class PropertyReceiver;
	class GlobalEventSet;	class GlobalEventSet;
	class XMLAttributes;	class XMLAttributes;
	class XMLHandler;	class XMLHandler;

	skipping to change at line 118	skipping to change at line 119
	class ItemEntry;	class ItemEntry;
	class MenuItem;	class MenuItem;
	class ItemListBase;	class ItemListBase;
	class MenuBase;	class MenuBase;
	class Menubar;	class Menubar;
	class PopupMenu;	class PopupMenu;
	class ScrolledItemListBase;	class ScrolledItemListBase;
	class ItemListbox;	class ItemListbox;
	class TabButton;	class TabButton;
	class TabControl;	class TabControl;

		class Tree;

	} // End of CEGUI namespace section	} // End of CEGUI namespace section

	#endif // end of guard _CEGUIForwardRefs_h_	#endif // end of guard _CEGUIForwardRefs_h_

End of changes. 2 change blocks.
	0 lines changed or deleted	2 lines changed or added

	CEGUIInputEvent.h	CEGUIInputEvent.h

	skipping to change at line 200	skipping to change at line 200
	WebForward =0xE9, /* Web Forward */	WebForward =0xE9, /* Web Forward */
	WebBack =0xEA, /* Web Back */	WebBack =0xEA, /* Web Back */
	MyComputer =0xEB, /* My Computer */	MyComputer =0xEB, /* My Computer */
	Mail =0xEC, /* Mail */	Mail =0xEC, /* Mail */
	MediaSelect =0xED /* Media Select */	MediaSelect =0xED /* Media Select */
	};	};

	};	};

	/*!	/*!

	/brief	\brief
	Enumeration of mouse buttons	Enumeration of mouse buttons
	*/	*/
	enum MouseButton	enum MouseButton
	{	{

	LeftButton,	//! The left mouse button.
	RightButton,	LeftButton,
	MiddleButton,	//! The right mouse button.
	X1Button,	RightButton,
	X2Button,	//! The middle mouse button.
	MouseButtonCount, //<! Dummy value that is == to the m	MiddleButton,
	aximum number of mouse buttons supported.	//! The first 'extra' mouse button.
	NoButton //!< Value set for no mouse	X1Button,
	button. NB: This is not 0, do not assume!	//! The second 'extra' mouse button.
		X2Button,
		//! Value that equals the number of mouse buttons supported by CEGUI.
		MouseButtonCount,
		//! Value set for no mouse button. NB: This is not 0, do not assume!
		NoButton
	};	};

	/*!	/*!
	\brief	\brief
	System key flag values	System key flag values
	*/	*/
	enum SystemKey	enum SystemKey
	{	{
	LeftMouse = 0x0001, //!< The lef t mouse button.	LeftMouse = 0x0001, //!< The lef t mouse button.
	RightMouse = 0x0002, //!< The rig ht mouse button.	RightMouse = 0x0002, //!< The rig ht mouse button.

	skipping to change at line 238	skipping to change at line 245
	};	};

	/*!	/*!
	\brief	\brief
	EventArgs based class that is used for objects passed to handlers tr iggered for events	EventArgs based class that is used for objects passed to handlers tr iggered for events
	concerning some Window object.	concerning some Window object.
	*/	*/
	class CEGUIEXPORT WindowEventArgs : public EventArgs	class CEGUIEXPORT WindowEventArgs : public EventArgs
	{	{
	public:	public:

	WindowEventArgs(Window* wnd) : window(wnd) {}	WindowEventArgs(Window* wnd) : window(wnd) {
		this->d_hasWindow = true;
		}

	Window* window; //!< pointer to a Window object of relevance to the event.	Window* window; //!< pointer to a Window object of relevance to the event.
	};	};

	/*!	/*!
	\brief	\brief

		WindowEventArgs class that is primarily used by lua scripts
		*/
		class CEGUIEXPORT UpdateEventArgs : public WindowEventArgs
		{
		public:
		UpdateEventArgs(Window* window, float tslf) :
		WindowEventArgs(window),
		d_timeSinceLastFrame(tslf)
		{}

		float d_timeSinceLastFrame; //!< Time since the last frame update
		};

		/*!
		\brief
	EventArgs based class that is used for objects passed to input event handlers	EventArgs based class that is used for objects passed to input event handlers
	concerning mouse input.	concerning mouse input.
	*/	*/
	class CEGUIEXPORT MouseEventArgs : public WindowEventArgs	class CEGUIEXPORT MouseEventArgs : public WindowEventArgs
	{	{
	public:	public:
	MouseEventArgs(Window* wnd) : WindowEventArgs(wnd) {}	MouseEventArgs(Window* wnd) : WindowEventArgs(wnd) {}

	Point position; //!< holds current mouse pos ition.	Point position; //!< holds current mouse pos ition.
	Vector2 moveDelta; //!< holds variation of mous e position from last mouse input	Vector2 moveDelta; //!< holds variation of mous e position from last mouse input

End of changes. 4 change blocks.
	12 lines changed or deleted	34 lines changed or added

	CEGUIItemListBase.h	CEGUIItemListBase.h

	skipping to change at line 238	skipping to change at line 238
	Pointer to the ItemEntry to be added to the list. Note that it is the passed object that is added to the	Pointer to the ItemEntry to be added to the list. Note that it is the passed object that is added to the
	list, a copy is not made. If this parameter is NULL, nothin g happens.	list, a copy is not made. If this parameter is NULL, nothin g happens.

	\return	\return
	Nothing.	Nothing.
	*/	*/
	void addItem(ItemEntry* item);	void addItem(ItemEntry* item);

	/*!	/*!
	\brief	\brief

	Insert an item into the list after a specified item already in the list.	Insert an item into the list before a specified item already in the list.


	Note that if the list is sorted, the item may not end up in	Note that if the list is sorted, the item may not end up in
	the requested position.	the
		requested position.

	\param item	\param item

	Pointer to the ItemEntry to be inserted. Note that it is th	Pointer to the ItemEntry to be inserted. Note that it is th
	e passed object that is added to the	e passed
	list, a copy is not made. If this parameter is NULL, nothin	object that is added to the list, a copy is not made. If this para
	g happens.	meter
		is NULL, nothing happens.

	\param position	\param position

	Pointer to a ItemEntry that \a item is to be inserted after.	Pointer to a ItemEntry that \a item is to be inserted before
	If this parameter is NULL, the item is	. If this
	inserted at the start of the list.	parameter is NULL, the item is inserted at the start of the list.

	\return	\return
	Nothing.	Nothing.
	*/	*/
	void insertItem(ItemEntry* item, const ItemEntry* position);	void insertItem(ItemEntry* item, const ItemEntry* position);

	/*!	/*!
	\brief	\brief
	Removes the given item from the list. If the item is has th e 'DestroyedByParent' property set to 'true', the item will be deleted.	Removes the given item from the list. If the item is has th e 'DestroyedByParent' property set to 'true', the item will be deleted.


End of changes. 4 change blocks.
	10 lines changed or deleted	12 lines changed or added

	CEGUIItemListbox.h	CEGUIItemListbox.h

	skipping to change at line 143	skipping to change at line 143

	/*!	/*!
	\brief	\brief
	Returns 'true' if the item at the given index is selectable and cur rently selected.	Returns 'true' if the item at the given index is selectable and cur rently selected.
	*/	*/
	bool isItemSelected(size_t index) const;	bool isItemSelected(size_t index) const;

	/********************************************************************	/********************************************************************
	Manipulators	Manipulators
	********************************************************************* /	********************************************************************* /

		// Overridden from base class
		virtual void initialiseComponents(void);

	/*!	/*!
	\brief	\brief
	Set whether or not multiple selections should be allowed.	Set whether or not multiple selections should be allowed.
	*/	*/
	void setMultiSelectEnabled(bool state);	void setMultiSelectEnabled(bool state);

	/*!	/*!
	\brief	\brief
	Clears all selections.	Clears all selections.
	*/	*/

	skipping to change at line 287	skipping to change at line 290
	/********************************************************************	/********************************************************************
	Implementation data	Implementation data
	*********************************************************************** */	*********************************************************************** */
	bool d_multiSelect; //! Controls whether multiple items can be selected simultaneously	bool d_multiSelect; //! Controls whether multiple items can be selected simultaneously
	ItemEntry* d_lastSelected; //! The last item that was selected	ItemEntry* d_lastSelected; //! The last item that was selected
	mutable size_t d_nextSelectionIndex; //! The index of the last item tha t was returned with the getFirst/NextSelection members	mutable size_t d_nextSelectionIndex; //! The index of the last item tha t was returned with the getFirst/NextSelection members

	private:	private:
	void addItemListboxProperties(void);	void addItemListboxProperties(void);
	void addItemListboxEvents(void);	void addItemListboxEvents(void);

		//! Handler called when window is removed from the content pane
		bool handle_PaneChildRemoved(const EventArgs& e);
	};	};

	} // end CEGUI namespace	} // end CEGUI namespace

	#if defined(_MSC_VER)	#if defined(_MSC_VER)
	# pragma warning(pop)	# pragma warning(pop)
	#endif	#endif

	#endif // end of guard _CEGUIItemListbox_h_	#endif // end of guard _CEGUIItemListbox_h_

End of changes. 2 change blocks.
	0 lines changed or deleted	5 lines changed or added

	CEGUIListbox.h	CEGUIListbox.h

	skipping to change at line 294	skipping to change at line 294
	Pointer to the ListboxItem to be added to the list. Note th at it is the passed object that is added to the	Pointer to the ListboxItem to be added to the list. Note th at it is the passed object that is added to the
	list, a copy is not made. If this parameter is NULL, nothin g happens.	list, a copy is not made. If this parameter is NULL, nothin g happens.

	\return	\return
	Nothing.	Nothing.
	*/	*/
	void addItem(ListboxItem* item);	void addItem(ListboxItem* item);

	/*!	/*!
	\brief	\brief

	Insert an item into the list box after a specified item alre	Insert an item into the list box before a specified item alr
	ady in the list.	eady in the
		list.


	Note that if the list is sorted, the item may not end up in	Note that if the list is sorted, the item may not end up in
	the requested position.	the
		requested position.

	\param item	\param item

	Pointer to the ListboxItem to be inserted. Note that it is	Pointer to the ListboxItem to be inserted. Note that it is
	the passed object that is added to the	the passed
	list, a copy is not made. If this parameter is NULL, nothin	object that is added to the list, a copy is not made. If this para
	g happens.	meter
		is NULL, nothing happens.

	\param position	\param position

	Pointer to a ListboxItem that \a item is to be inserted afte	Pointer to a ListboxItem that \a item is to be inserted befo
	r. If this parameter is NULL, the item is	re. If this
	inserted at the start of the list.	parameter is NULL, the item is inserted at the start of the list.

	\return	\return
	Nothing.	Nothing.


	\exception InvalidRequestException thrown if no ListboxItem \a	\exception InvalidRequestException thrown if no ListboxItem \a
	position is attached to this list box.	position is
		attached to this list box.
	*/	*/
	void insertItem(ListboxItem* item, const ListboxItem* position);	void insertItem(ListboxItem* item, const ListboxItem* position);

	/*!	/*!
	\brief	\brief
	Removes the given item from the list box. If the item is ha s the auto delete state set, the item will be deleted.	Removes the given item from the list box. If the item is ha s the auto delete state set, the item will be deleted.

	\param item	\param item
	Pointer to the ListboxItem that is to be removed. If \a ite m is not attached to this list box then nothing	Pointer to the ListboxItem that is to be removed. If \a ite m is not attached to this list box then nothing
	will happen.	will happen.

	skipping to change at line 625	skipping to change at line 629
	Internal handler that is triggered when the user interacts with t he scrollbars.	Internal handler that is triggered when the user interacts with t he scrollbars.
	*/	*/
	bool handle_scrollChange(const EventArgs& args);	bool handle_scrollChange(const EventArgs& args);

	// validate window renderer	// validate window renderer
	virtual bool validateWindowRenderer(const String& name) const	virtual bool validateWindowRenderer(const String& name) const
	{	{
	return (name == "Listbox");	return (name == "Listbox");
	}	}


		/*!
		\brief
		Causes the internal list to be (re)sorted.
		*/
		void resortList();

	/***************************************************************** ****	/***************************************************************** ****
	New event handlers	New event handlers
	****************************************************************** ***/	****************************************************************** ***/
	/*!	/*!
	\brief	\brief
	Handler called internally when the list contents are changed	Handler called internally when the list contents are changed
	*/	*/
	virtual void onListContentsChanged(WindowEventArgs& e);	virtual void onListContentsChanged(WindowEventArgs& e);

	/*!	/*!

End of changes. 6 change blocks.
	13 lines changed or deleted	23 lines changed or added

	CEGUILogger.h	CEGUILogger.h

	skipping to change at line 58	skipping to change at line 58
	namespace CEGUI	namespace CEGUI
	{	{

	/*!	/*!
	\brief	\brief
	Enumeration of logging levels	Enumeration of logging levels
	*/	*/
	enum LoggingLevel	enum LoggingLevel
	{	{
	Errors, //!< Only actual error conditions will be lo gged.	Errors, //!< Only actual error conditions will be lo gged.

		Warnings, //!< Warnings will be logged as well.
	Standard, //!< Basic events will be logged (default le vel).	Standard, //!< Basic events will be logged (default le vel).
	Informative, //!< Useful tracing (object creations etc) informati on will be logged.	Informative, //!< Useful tracing (object creations etc) informati on will be logged.
	Insane //!< Mostly everything gets logged (use for heavy tracing only, log WILL be big).	Insane //!< Mostly everything gets logged (use for heavy tracing only, log WILL be big).
	};	};

	/*!	/*!
	\brief	\brief
	Abstract class that defines the interface of a logger object for the GUI system.	Abstract class that defines the interface of a logger object for the GUI system.
	The default implementation of this interface is the DefaultLogger class ; if you	The default implementation of this interface is the DefaultLogger class ; if you
	want to perform special logging, derive your own class from Logger and initialize	want to perform special logging, derive your own class from Logger and initialize

End of changes. 1 change blocks.
	0 lines changed or deleted	1 lines changed or added

	CEGUIMenuBase.h	CEGUIMenuBase.h

	skipping to change at line 148	skipping to change at line 148
	handler invoked internally when the a MenuItem attached to t his menu opens its popup.	handler invoked internally when the a MenuItem attached to t his menu opens its popup.
	*/	*/
	virtual void onPopupOpened(WindowEventArgs& e);	virtual void onPopupOpened(WindowEventArgs& e);

	/*!	/*!
	\brief	\brief
	handler invoked internally when the a MenuItem attached to t his menu closes its popup.	handler invoked internally when the a MenuItem attached to t his menu closes its popup.
	*/	*/
	virtual void onPopupClosed(WindowEventArgs& e);	virtual void onPopupClosed(WindowEventArgs& e);


		// overridden from base
		virtual void onChildRemoved(WindowEventArgs& e);

	/***************************************************************** ****	/***************************************************************** ****
	Implementation Functions	Implementation Functions
	****************************************************************** ***/	****************************************************************** ***/
	/*!	/*!
	\brief	\brief
	Return whether this window was inherited from the given clas s name at some point in the inheritance hierarchy.	Return whether this window was inherited from the given clas s name at some point in the inheritance hierarchy.

	\param class_name	\param class_name
	The class name that is to be checked.	The class name that is to be checked.


End of changes. 1 change blocks.
	0 lines changed or deleted	3 lines changed or added

	CEGUIMultiColumnListProperties.h	CEGUIMultiColumnListProperties.h

	skipping to change at line 308	skipping to change at line 308
	String get(const PropertyReceiver* receiver) const;	String get(const PropertyReceiver* receiver) const;
	void set(PropertyReceiver* receiver, const String& value);	void set(PropertyReceiver* receiver, const String& value);
	};	};

	/*!	/*!
	\brief	\brief
	Property to access a column.	Property to access a column.

	\par Usage:	\par Usage:
	- Name: ColumnHeader	- Name: ColumnHeader

	- Format: "text:[caption] width:[float] id:[uint]"	- Format: "text:[caption] width:{s,o} id:[uint]"

	\par where:	\par where:
	- [caption] is the column header caption text.	- [caption] is the column header caption text.

	- [float] is the width of the column.	- [{s,o}] is a UDim specification.
	- [uint] is the unique ID for the column.	- [uint] is the unique ID for the column.
	*/	*/
	class ColumnHeader : public Property	class ColumnHeader : public Property
	{	{
	public:	public:
	ColumnHeader() : Property(	ColumnHeader() : Property(
	"ColumnHeader",	"ColumnHeader",
	"Property to set up a column (there is no getter for this pr operty)",	"Property to set up a column (there is no getter for this pr operty)",
	"", false)	"", false)
	{}	{}

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	CEGUIMultiLineEditbox.h	CEGUIMultiLineEditbox.h

	skipping to change at line 211	skipping to change at line 211

	\return	\return
	Pointer to a Scrollbar object.	Pointer to a Scrollbar object.

	\exception UnknownObjectException	\exception UnknownObjectException
	Thrown if the vertical Scrollbar component does not exist.	Thrown if the vertical Scrollbar component does not exist.
	*/	*/
	Scrollbar* getVertScrollbar() const;	Scrollbar* getVertScrollbar() const;

	/*!	/*!

		\brief
		Return whether the vertical scroll bar is always shown.

		\return
		- true if the scroll bar will always be shown even if it is
		not required.
		- false if the scroll bar will only be shown when it is requ
		ired.
		*/
		bool isVertScrollbarAlwaysShown(void) const;

		/*!
	\brief	\brief
	Return a pointer to the horizontal scrollbar component widget for t his	Return a pointer to the horizontal scrollbar component widget for t his
	MultiLineEditbox.	MultiLineEditbox.

	\return	\return
	Pointer to a Scrollbar object.	Pointer to a Scrollbar object.

	\exception UnknownObjectException	\exception UnknownObjectException
	Thrown if the horizontal Scrollbar component does not exist.	Thrown if the horizontal Scrollbar component does not exist.
	*/	*/

	skipping to change at line 332	skipping to change at line 342

	\param setting	\param setting
	- true if the text should word-wrap at the edges of the text box.	- true if the text should word-wrap at the edges of the text box.
	- false if the text should not wrap, but a scroll bar should be used.	- false if the text should not wrap, but a scroll bar should be used.

	\return	\return
	Nothing.	Nothing.
	*/	*/
	void setWordWrapping(bool setting);	void setWordWrapping(bool setting);


		/*!
		\brief
		Set whether the vertical scroll bar should always be shown.

		\param setting
		true if the vertical scroll bar should be shown even when it
		is not required. false if the vertical
		scroll bar should only be shown when it is required.

		\return
		Nothing.
		*/
		void setShowVertScrollbar(bool setting);

	// selection brush image property support	// selection brush image property support
	void setSelectionBrushImage(const Image* image);	void setSelectionBrushImage(const Image* image);
	const Image* getSelectionBrushImage() const;	const Image* getSelectionBrushImage() const;

	/***************************************************************** ****	/***************************************************************** ****
	Construction and Destruction	Construction and Destruction
	****************************************************************** ***/	****************************************************************** ***/
	/*!	/*!
	\brief	\brief
	Constructor for the MultiLineEditbox base class.	Constructor for the MultiLineEditbox base class.

	skipping to change at line 642	skipping to change at line 665
	/***************************************************************** ****	/***************************************************************** ****
	Static Properties for this class	Static Properties for this class
	****************************************************************** ***/	****************************************************************** ***/
	static MultiLineEditboxProperties::ReadOnly d_readOnlyProperty;	static MultiLineEditboxProperties::ReadOnly d_readOnlyProperty;
	static MultiLineEditboxProperties::WordWrap d_wordWrapProperty;	static MultiLineEditboxProperties::WordWrap d_wordWrapProperty;
	static MultiLineEditboxProperties::CaratIndex d_caratIndexProperty;	static MultiLineEditboxProperties::CaratIndex d_caratIndexProperty;
	static MultiLineEditboxProperties::SelectionStart d_selectionStartProperty;	static MultiLineEditboxProperties::SelectionStart d_selectionStartProperty;
	static MultiLineEditboxProperties::SelectionLength d_selectionLengthProperty;	static MultiLineEditboxProperties::SelectionLength d_selectionLengthProperty;
	static MultiLineEditboxProperties::MaxTextLength d_maxTextLengthProperty;	static MultiLineEditboxProperties::MaxTextLength d_maxTextLengthProperty;
	static MultiLineEditboxProperties::SelectionBrushImage d_selection BrushProperty;	static MultiLineEditboxProperties::SelectionBrushImage d_selection BrushProperty;

		static MultiLineEditboxProperties::ForceVertScrollbar d_forceV ertProperty;

	/***************************************************************** ****	/***************************************************************** ****
	Private methods	Private methods
	****************************************************************** ***/	****************************************************************** ***/
	void addMultiLineEditboxProperties(void);	void addMultiLineEditboxProperties(void);
	};	};

	} // End of CEGUI namespace section	} // End of CEGUI namespace section

	#if defined(_MSC_VER)	#if defined(_MSC_VER)

End of changes. 3 change blocks.
	0 lines changed or deleted	27 lines changed or added

	CEGUIMultiLineEditboxProperties.h	CEGUIMultiLineEditboxProperties.h

	skipping to change at line 214	skipping to change at line 214
	SelectionBrushImage() : Property(	SelectionBrushImage() : Property(
	"SelectionBrushImage",	"SelectionBrushImage",
	"Property to get/set the selection brush image for the editbox. Va lue should be \"set:[imageset name] image:[image name]\".",	"Property to get/set the selection brush image for the editbox. Va lue should be \"set:[imageset name] image:[image name]\".",
	"")	"")
	{}	{}

	String get(const PropertyReceiver* receiver) const;	String get(const PropertyReceiver* receiver) const;
	void set(PropertyReceiver* receiver, const String& value);	void set(PropertyReceiver* receiver, const String& value);
	};	};


		/*!
		\brief
		Property to access the 'always show' setting for the vertical scroll
		bar of the box.

		\par Usage:
		- Name: ForceVertScrollbar
		- Format: "[text]"

		\par Where [Text] is:
		- "True" to indicate that the vertical scroll bar will alway
		s be shown.
		- "False" to indicate that the vertical scroll bar will only
		be shown when it is needed.
		*/
		class ForceVertScrollbar : public Property
		{
		public:
		ForceVertScrollbar() : Property(
		"ForceVertScrollbar",
		"Property to get/set the 'always show' setting for the verti
		cal scroll bar of the list box. Value is either \"True\" or \"False\".",
		"False")
		{}

		String get(const PropertyReceiver* receiver) const;
		void set(PropertyReceiver* receiver, const String& value);
		};

	} // End of MultiLineEditboxProperties namespace section	} // End of MultiLineEditboxProperties namespace section

	} // End of CEGUI namespace section	} // End of CEGUI namespace section

	#endif // end of guard _CEGUIMultiLineEditboxProperties_h_	#endif // end of guard _CEGUIMultiLineEditboxProperties_h_

End of changes. 1 change blocks.
	0 lines changed or deleted	29 lines changed or added

	CEGUIScriptModule.h	CEGUIScriptModule.h

	skipping to change at line 152	skipping to change at line 152
	/*!	/*!
	\brief	\brief
	Return identification string for the ScriptModule. If the internal id string has not been	Return identification string for the ScriptModule. If the internal id string has not been
	set by the ScriptModule creator, a generic string of "Unknown scrip ting module" will be returned.	set by the ScriptModule creator, a generic string of "Unknown scrip ting module" will be returned.

	\return	\return
	String object holding a string that identifies the ScriptModule in use.	String object holding a string that identifies the ScriptModule in use.
	*/	*/
	const String& getIdentifierString() const;	const String& getIdentifierString() const;


		/*!
		\brief
		Return an string which identifies the language of this modul
		e.
		/return
		String object holding a string that identifies the languge o
		f the module
		*/
		const String& getLanguage() const;

	/*!	/*!
	\brief	\brief
	Subscribes the named Event to a scripted funtion	Subscribes the named Event to a scripted funtion

	\param target	\param target
	The target EventSet for the subscription.	The target EventSet for the subscription.

	\param name	\param name
	String object containing the name of the Event to subscribe to.	String object containing the name of the Event to subscribe to.


	skipping to change at line 221	skipping to change at line 229

	\return	\return
	String describing the default resource group identifier..	String describing the default resource group identifier..
	*/	*/
	static const String& getDefaultResourceGroup()	static const String& getDefaultResourceGroup()
	{ return d_defaultResourceGroup; }	{ return d_defaultResourceGroup; }

	protected:	protected:
	//! String that holds some id information about the module.	//! String that holds some id information about the module.
	String d_identifierString;	String d_identifierString;

		//! String that holds a string containing the languge of the scripti
		ng modue.
		String d_language;
	//! holds the default resource group ID for loading script files.	//! holds the default resource group ID for loading script files.
	static String d_defaultResourceGroup;	static String d_defaultResourceGroup;
	};	};

	/*!	/*!
	\brief	\brief
	Functor class used for binding named script functions to events	Functor class used for binding named script functions to events
	*/	*/
	class ScriptFunctor	class ScriptFunctor
	{	{

End of changes. 2 change blocks.
	0 lines changed or deleted	13 lines changed or added

	CEGUISpinner.h	CEGUISpinner.h

	skipping to change at line 434	skipping to change at line 434
	Adds properties supported by the Spinner class.	Adds properties supported by the Spinner class.

	\return	\return
	Nothing.	Nothing.
	*/	*/
	void addSpinnerProperties(void);	void addSpinnerProperties(void);
	};	};

	} // End of CEGUI namespace section	} // End of CEGUI namespace section


		#if defined(_MSC_VER)
		# pragma warning(pop)
		#endif

	#endif // end of guard _CEGUISpinner_h_	#endif // end of guard _CEGUISpinner_h_

End of changes. 1 change blocks.
	0 lines changed or deleted	4 lines changed or added

	CEGUIString.h	CEGUIString.h

	skipping to change at line 1309	skipping to change at line 1309
	\return	\return
	This String after the assignment has happened	This String after the assignment has happened

	\exception std::out_of_range Thrown if str_idx is invalid for \a str	\exception std::out_of_range Thrown if str_idx is invalid for \a str
	*/	*/
	String& assign(const String& str, size_type str_idx = 0, size_type s tr_num = npos)	String& assign(const String& str, size_type str_idx = 0, size_type s tr_num = npos)
	{	{
	if (str.d_cplength < str_idx)	if (str.d_cplength < str_idx)
	throw std::out_of_range("Index was out of range for CEGUI::String object");	throw std::out_of_range("Index was out of range for CEGUI::String object");


	if (str_num == npos)	if ((str_num == npos) \|\| (str_num > str.d_cplength - str_idx ))
	str_num = str.d_cplength - str_idx;	str_num = str.d_cplength - str_idx;

	grow(str_num);	grow(str_num);
	setlen(str_num);	setlen(str_num);
	memcpy(ptr(), &str.ptr()[str_idx], str_num * sizeof(utf32));	memcpy(ptr(), &str.ptr()[str_idx], str_num * sizeof(utf32));

	return *this;	return *this;
	}	}

	/*!	/*!

	skipping to change at line 1368	skipping to change at line 1368
	This String after the assignment has happened	This String after the assignment has happened

	\exception std::out_of_range Thrown if \a str_idx is invalid for \a std_str	\exception std::out_of_range Thrown if \a str_idx is invalid for \a std_str
	\exception std::length_error Thrown if the resulting String would have been too large.	\exception std::length_error Thrown if the resulting String would have been too large.
	*/	*/
	String& assign(const std::string& std_str, size_type str_idx = 0, si ze_type str_num = npos)	String& assign(const std::string& std_str, size_type str_idx = 0, si ze_type str_num = npos)
	{	{
	if (std_str.size() < str_idx)	if (std_str.size() < str_idx)
	throw std::out_of_range("Index was out of range for std::string object");	throw std::out_of_range("Index was out of range for std::string object");


	if (str_num == npos)	if ((str_num == npos) \|\| (str_num > (size_type)std_str.size( ) - str_idx))
	str_num = (size_type)std_str.size() - str_idx;	str_num = (size_type)std_str.size() - str_idx;

	grow(str_num);	grow(str_num);
	setlen(str_num);	setlen(str_num);

	while(str_num--)	while(str_num--)
	{	{
	((*this)[str_num]) = static_cast<utf32>(static_cast< unsigned char>(std_str[str_num + str_idx]));	((*this)[str_num]) = static_cast<utf32>(static_cast< unsigned char>(std_str[str_num + str_idx]));
	}	}


	skipping to change at line 1650	skipping to change at line 1650
	This String after the append operation	This String after the append operation

	\exception std::out_of_range Thrown if \a str_idx is invalid for \a str.	\exception std::out_of_range Thrown if \a str_idx is invalid for \a str.
	\exception std::length_error Thrown if resulting String would be too large.	\exception std::length_error Thrown if resulting String would be too large.
	*/	*/
	String& append(const String& str, size_type str_idx = 0, size_type s tr_num = npos)	String& append(const String& str, size_type str_idx = 0, size_type s tr_num = npos)
	{	{
	if (str.d_cplength < str_idx)	if (str.d_cplength < str_idx)
	throw std::out_of_range("Index is out of range for C EGUI::String");	throw std::out_of_range("Index is out of range for C EGUI::String");


	if (str_num == npos)	if ((str_num == npos) \|\| (str_num > str.d_cplength - str_idx ))
	str_num = str.d_cplength - str_idx;	str_num = str.d_cplength - str_idx;

	grow(d_cplength + str_num);	grow(d_cplength + str_num);
	memcpy(&ptr()[d_cplength], &str.ptr()[str_idx], str_num * si zeof(utf32));	memcpy(&ptr()[d_cplength], &str.ptr()[str_idx], str_num * si zeof(utf32));
	setlen(d_cplength + str_num);	setlen(d_cplength + str_num);
	return *this;	return *this;
	}	}

	/*!	/*!
	\brief	\brief

	skipping to change at line 1708	skipping to change at line 1708
	This String after the append operation	This String after the append operation

	\exception std::out_of_range Thrown if \a str_idx is invalid for \a std_str.	\exception std::out_of_range Thrown if \a str_idx is invalid for \a std_str.
	\exception std::length_error Thrown if resulting String would be too large.	\exception std::length_error Thrown if resulting String would be too large.
	*/	*/
	String& append(const std::string& std_str, size_type str_idx = 0, si ze_type str_num = npos)	String& append(const std::string& std_str, size_type str_idx = 0, si ze_type str_num = npos)
	{	{
	if (std_str.size() < str_idx)	if (std_str.size() < str_idx)
	throw std::out_of_range("Index is out of range for s td::string");	throw std::out_of_range("Index is out of range for s td::string");


	if (str_num == npos)	if ((str_num == npos) \|\| (str_num > (size_type)std_str.size( ) - str_idx))
	str_num = (size_type)std_str.size() - str_idx;	str_num = (size_type)std_str.size() - str_idx;

	size_type newsze = d_cplength + str_num;	size_type newsze = d_cplength + str_num;

	grow(newsze);	grow(newsze);
	utf32* pt = &ptr()[newsze-1];	utf32* pt = &ptr()[newsze-1];

	while(str_num--)	while(str_num--)
	*pt-- = static_cast<utf32>(static_cast<unsigned char >(std_str[str_num]));	*pt-- = static_cast<utf32>(static_cast<unsigned char >(std_str[str_num]));


	skipping to change at line 2011	skipping to change at line 2011
	This String after the insert.	This String after the insert.

	\exception std::out_of_range Thrown if \a idx or \a str_idx are o ut of range.	\exception std::out_of_range Thrown if \a idx or \a str_idx are o ut of range.
	\exception std::length_error Thrown if resulting String would be too large.	\exception std::length_error Thrown if resulting String would be too large.
	*/	*/
	String& insert(size_type idx, const String& str, size_type str_idx, size_type str_num)	String& insert(size_type idx, const String& str, size_type str_idx, size_type str_num)
	{	{
	if ((d_cplength < idx) \|\| (str.d_cplength < str_idx))	if ((d_cplength < idx) \|\| (str.d_cplength < str_idx))
	throw std::out_of_range("Index is out of range for C EGUI::String");	throw std::out_of_range("Index is out of range for C EGUI::String");


	if (str_num == npos)	if ((str_num == npos) \|\| (str_num > str.d_cplength - str_idx ))
	str_num = str.d_cplength - str_idx;	str_num = str.d_cplength - str_idx;

	size_type newsz = d_cplength + str_num;	size_type newsz = d_cplength + str_num;
	grow(newsz);	grow(newsz);
	memmove(&ptr()[idx + str_num], &ptr()[idx], (d_cplength - id x) * sizeof(utf32));	memmove(&ptr()[idx + str_num], &ptr()[idx], (d_cplength - id x) * sizeof(utf32));
	memcpy(&ptr()[idx], &str.ptr()[str_idx], str_num * sizeof(ut f32));	memcpy(&ptr()[idx], &str.ptr()[str_idx], str_num * sizeof(ut f32));
	setlen(newsz);	setlen(newsz);

	return *this;	return *this;
	}	}

	skipping to change at line 2082	skipping to change at line 2082
	\exception std::length_error Thrown if resulting String would be too large.	\exception std::length_error Thrown if resulting String would be too large.
	*/	*/
	String& insert(size_type idx, const std::string& std_str, size_type str_idx, size_type str_num)	String& insert(size_type idx, const std::string& std_str, size_type str_idx, size_type str_num)
	{	{
	if (d_cplength < idx)	if (d_cplength < idx)
	throw std::out_of_range("Index is out of range for C EGUI::String");	throw std::out_of_range("Index is out of range for C EGUI::String");

	if (std_str.size() < str_idx)	if (std_str.size() < str_idx)
	throw std::out_of_range("Index is out of range for s td::string");	throw std::out_of_range("Index is out of range for s td::string");


	if (str_num == npos)	if ((str_num == npos) \|\| (str_num > (size_type)std_str.size( ) - str_idx))
	str_num = (size_type)std_str.size() - str_idx;	str_num = (size_type)std_str.size() - str_idx;

	size_type newsz = d_cplength + str_num;	size_type newsz = d_cplength + str_num;
	grow(newsz);	grow(newsz);

	memmove(&ptr()[idx + str_num], &ptr()[idx], (d_cplength - id x) * sizeof(utf32));	memmove(&ptr()[idx + str_num], &ptr()[idx], (d_cplength - id x) * sizeof(utf32));

	utf32* pt = &ptr()[idx + str_num - 1];	utf32* pt = &ptr()[idx + str_num - 1];

	while(str_num--)	while(str_num--)

	skipping to change at line 4746	skipping to change at line 4746
	ptr()[len] = (utf32)(0);	ptr()[len] = (utf32)(0);
	}	}

	// initialise string object	// initialise string object
	void init(void)	void init(void)
	{	{
	d_reserve = STR_QUICKBUFF_SIZE;	d_reserve = STR_QUICKBUFF_SIZE;
	d_encodedbuff = 0;	d_encodedbuff = 0;
	d_encodedbufflen = 0;	d_encodedbufflen = 0;
	d_encodeddatlen = 0;	d_encodeddatlen = 0;

		d_buffer = 0;
	setlen(0);	setlen(0);
	}	}

	// return true if the given pointer is inside the string data	// return true if the given pointer is inside the string data
	bool inside(utf32* inptr)	bool inside(utf32* inptr)
	{	{
	if (inptr < ptr() \|\| ptr() + d_cplength <= inptr)	if (inptr < ptr() \|\| ptr() + d_cplength <= inptr)
	return false;	return false;
	else	else
	return true;	return true;

End of changes. 7 change blocks.
	6 lines changed or deleted	7 lines changed or added

	CEGUISystem.h	CEGUISystem.h

	skipping to change at line 268	skipping to change at line 268

	\return	\return
	Size object describing the current multi-click tolerance are a size.	Size object describing the current multi-click tolerance are a size.
	*/	*/
	const Size& getMultiClickToleranceAreaSize(void) const {return d_dblclick_size;}	const Size& getMultiClickToleranceAreaSize(void) const {return d_dblclick_size;}

	/*!	/*!
	\brief	\brief
	Set the timeout used for generation of single-click events.	Set the timeout used for generation of single-click events.


	A single-click is defined here as a button being pressed and	A single-click is defined here as a button being pressed and
	then released.	then
		released.

	\param timeout	\param timeout

	double value equal to the single-click timeout value to be u	double value equal to the single-click timeout value to be u
	sed from now onwards.	sed from now
		onwards.

		\note
		A timeout value of 0 indicates infinity and so no timeout occurrs;
		as
		long as the mouse is in the prescribed area, a mouse button 'clicke
		d'
		event will therefore always be raised.

	\return	\return
	Nothing.	Nothing.
	*/	*/
	void setSingleClickTimeout(double timeout);	void setSingleClickTimeout(double timeout);

	/*!	/*!
	\brief	\brief
	Set the timeout to be used for the generation of multi-click events.	Set the timeout to be used for the generation of multi-click events.


	A multi-click event is a double-click, or a triple-click. T	A multi-click event is a double-click, or a triple-click. T
	he value returned	he value
	here is the maximum allowable time between mouse button down	returned here is the maximum allowable time between mouse button do
	events for which	wn
	a multi-click event will be generated.	events for which a multi-click event will be generated.

	\param timeout	\param timeout

	double value equal to the multi-click timeout value to be us	double value equal to the multi-click timeout value to be us
	ed from now onwards.	ed from now
		onwards.

		\note
		A timeout value of 0 indicates infinity and so no timeout occurrs;
		as
		long as the mouse is in the prescribed area, an appropriate mouse b
		utton
		event will therefore always be raised.

	\return	\return
	Nothing.	Nothing.
	*/	*/
	void setMultiClickTimeout(double timeout);	void setMultiClickTimeout(double timeout);

	/*!	/*!
	\brief	\brief
	Set the size of the allowable mouse movement tolerance used when generating multi-click events.	Set the size of the allowable mouse movement tolerance used when generating multi-click events.


	skipping to change at line 479	skipping to change at line 492
	\brief	\brief
	Return the current system keys value.	Return the current system keys value.

	\return	\return
	uint value representing a combination of the SystemKey bits.	uint value representing a combination of the SystemKey bits.
	*/	*/
	uint getSystemKeys(void) const { return d_sysKeys; }	uint getSystemKeys(void) const { return d_sysKeys; }

	/*!	/*!
	\brief	\brief

		Set a new XML parser module to be used.

		The current XMLParser will be cleaned up and, if owned by the syste
		m,
		also deleted, as will any dynamically loaded module associated with
		the
		XMLParser object. The newly created XMLParser object, and the
		associated module will be owned by the system.

		\param parserName
		String object describing the name of the XML parser module to be us
		ed.
		*/
		void setXMLParser(const String& parserName);

		/*!
		\brief
		Sets the XMLParser object to be used by the system.

		The current XMLParser will be cleaned up and, if owned by the syste
		m,
		also deleted, as will any dynamically loaded module associated with
		the
		XMLParser object.

		If the argument passed in the \a parser parameter is 0, the system
		will
		cleanup any existing parser as described above, and revert to using
		the parser provided by the default module (see getDefaultXMLParserN
		ame
		and setDefaultXMLParserName).

		\param parser
		Pointer to the XMLParser object to be used by the system, or 0 to c
		ause
		the system to initialise a default parser.
		*/
		void setXMLParser(XMLParser* parser);

		/*!
		\brief
	Return the XMLParser object.	Return the XMLParser object.
	*/	*/
	XMLParser* getXMLParser(void) const { return d_xmlParser; }	XMLParser* getXMLParser(void) const { return d_xmlParser; }

	/*!	/*!
	\brief	\brief
	Set the system default Tooltip object. This value may be NULL to i ndicate that no default Tooltip will be	Set the system default Tooltip object. This value may be NULL to i ndicate that no default Tooltip will be
	available.	available.

	\param tooltip	\param tooltip

	skipping to change at line 835	skipping to change at line 881

	//! cleanup the core system singleton objects	//! cleanup the core system singleton objects
	void destroySingletons();	void destroySingletons();

	//! handle creation and initialisation of the XML parser.	//! handle creation and initialisation of the XML parser.
	void setupXMLParser();	void setupXMLParser();

	//! handle cleanup of the XML parser	//! handle cleanup of the XML parser
	void cleanupXMLParser();	void cleanupXMLParser();


		//! common function used for injection of mouse positions and movements
		bool mouseMoveInjection_impl(MouseEventArgs& ma);

	/***************************************************************** ****	/***************************************************************** ****
	Handlers for System events	Handlers for System events
	****************************************************************** ***/	****************************************************************** ***/
	/*!	/*!
	\brief	\brief
	Handler called when the main system GUI Sheet (or root windo w) is changed.	Handler called when the main system GUI Sheet (or root windo w) is changed.

	\a e is a WindowEventArgs with 'window' set to the old root window.	\a e is a WindowEventArgs with 'window' set to the old root window.
	*/	*/
	void onGUISheetChanged(WindowEventArgs& e);	void onGUISheetChanged(WindowEventArgs& e);

End of changes. 6 change blocks.
	11 lines changed or deleted	72 lines changed or added

	CEGUITGAImageCodec.h	CEGUITGAImageCodec.h

	skipping to change at line 35	skipping to change at line 35
	* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.	* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
	* IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR	* IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
	* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,	* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
	* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR	* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
	* OTHER DEALINGS IN THE SOFTWARE.	* OTHER DEALINGS IN THE SOFTWARE.
	************************************************************************** */	************************************************************************** */
	#ifndef _CEGUITGAImageCodec_h_	#ifndef _CEGUITGAImageCodec_h_
	#define _CEGUITGAImageCodec_h_	#define _CEGUITGAImageCodec_h_
	#include "CEGUIImageCodec.h"	#include "CEGUIImageCodec.h"


	#if defined( __WIN32__ ) \|\| defined( _WIN32 )	#if (defined( __WIN32__ ) \|\| defined( _WIN32 )) && !defined(CEGUI_STATIC)
	# ifdef CEGUITGAIMAGECODEC_EXPORTS	# ifdef CEGUITGAIMAGECODEC_EXPORTS
	# define CEGUITGAIMAGECODEC_API __declspec(dllexport)	# define CEGUITGAIMAGECODEC_API __declspec(dllexport)
	# else	# else
	# define CEGUITGAIMAGECODEC_API __declspec(dllimport)	# define CEGUITGAIMAGECODEC_API __declspec(dllimport)
	# endif	# endif
	#else	#else
	# define CEGUITGAIMAGECODEC_API	# define CEGUITGAIMAGECODEC_API
	#endif	#endif

	namespace CEGUI	namespace CEGUI

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	CEGUITabControl.h	CEGUITabControl.h

	skipping to change at line 438	skipping to change at line 438
	/*!	/*!
	\brief	\brief
	create and return a pointer to a TabButton widget for use as a clic kable tab header	create and return a pointer to a TabButton widget for use as a clic kable tab header
	\param name	\param name
	Button name	Button name
	\return	\return
	Pointer to a TabButton to be used for changing tabs.	Pointer to a TabButton to be used for changing tabs.
	*/	*/
	TabButton* createTabButton(const String& name) const;	TabButton* createTabButton(const String& name) const;


		//! Implementation function to do main work of removing a tab.
		void removeTab_impl(Window* window);

	/***************************************************************** ****	/***************************************************************** ****
	New event handlers	New event handlers
	****************************************************************** ***/	****************************************************************** ***/

	/*!	/*!
	\brief	\brief
	Handler called internally when the currently selected item o r items changes.	Handler called internally when the currently selected item o r items changes.
	*/	*/
	virtual void onSelectionChanged(WindowEventArgs& e);	virtual void onSelectionChanged(WindowEventArgs& e);


	skipping to change at line 468	skipping to change at line 471
	/***************************************************************** ****	/***************************************************************** ****
	Implementation Data	Implementation Data
	****************************************************************** ***/	****************************************************************** ***/
	UDim d_tabHeight; //!< The height of the tabs in pixels	UDim d_tabHeight; //!< The height of the tabs in pixels
	UDim d_tabPadding; //!< The padding of the tabs relative t o parent	UDim d_tabPadding; //!< The padding of the tabs relative t o parent
	typedef std::vector<TabButton*> TabButtonVector;	typedef std::vector<TabButton*> TabButtonVector;
	TabButtonVector d_tabButtonVector; //!< Sorting for tabs	TabButtonVector d_tabButtonVector; //!< Sorting for tabs
	float d_firstTabOffset; //!< The offset in pixels of the first tab	float d_firstTabOffset; //!< The offset in pixels of the first tab
	TabPanePosition d_tabPanePos; //!< The position of the tab pane	TabPanePosition d_tabPanePos; //!< The position of the tab pane
	float d_btGrabPos; //!< The position on the button tab whe re user grabbed	float d_btGrabPos; //!< The position on the button tab whe re user grabbed

		//! Container used to track event subscriptions to added tab windows.
		std::map<Window*, Event::ScopedConnection> d_eventConnections;
	/******************************************************************** *	/******************************************************************** *
	Abstract Implementation Functions (must be provided by derived class)	Abstract Implementation Functions (must be provided by derived class)
	********************************************************************* /	********************************************************************* /
	/*!	/*!
	\brief	\brief
	create and return a pointer to a TabButton widget for use as a clic kable tab header	create and return a pointer to a TabButton widget for use as a clic kable tab header
	\param name	\param name
	Button name	Button name
	\return	\return
	Pointer to a TabButton to be used for changing tabs.	Pointer to a TabButton to be used for changing tabs.

End of changes. 2 change blocks.
	0 lines changed or deleted	5 lines changed or added

	CEGUIVersion.h	CEGUIVersion.h

	skipping to change at line 41	skipping to change at line 41
	This file contains CEGUI version defines	This file contains CEGUI version defines
	*************************************************************************/	*************************************************************************/
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	#ifndef _CEGUIVersion_h_	#ifndef _CEGUIVersion_h_
	#define _CEGUIVersion_h_	#define _CEGUIVersion_h_

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// Define CEGUI version	// Define CEGUI version
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	#define CEGUI_VERSION_MAJOR 0	#define CEGUI_VERSION_MAJOR 0

	#define CEGUI_VERSION_MINOR 5	#define CEGUI_VERSION_MINOR 6
	#define CEGUI_VERSION_PATCH 0	#define CEGUI_VERSION_PATCH 1

	#endif // end of guard _CEGUIVersion_h_	#endif // end of guard _CEGUIVersion_h_

End of changes. 1 change blocks.
	2 lines changed or deleted	2 lines changed or added

	CEGUIWidgetModule.h	CEGUIWidgetModule.h

	skipping to change at line 34	skipping to change at line 34
	* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,	* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
	* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR	* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
	* OTHER DEALINGS IN THE SOFTWARE.	* OTHER DEALINGS IN THE SOFTWARE.
	************************************************************************** */	************************************************************************** */
	#ifndef _CEGUIWidgetModule_h_	#ifndef _CEGUIWidgetModule_h_
	#define _CEGUIWidgetModule_h_	#define _CEGUIWidgetModule_h_

	#include "CEGUIExceptions.h"	#include "CEGUIExceptions.h"
	#include "CEGUIWindowFactoryManager.h"	#include "CEGUIWindowFactoryManager.h"


	#if defined( __WIN32__ ) \|\| defined( _WIN32 )	#if (defined( __WIN32__ ) \|\| defined( _WIN32 )) && !defined(CEGUI_STATIC)
	# ifdef CEGUIWIDGETMODULE_EXPORTS	# ifdef CEGUIWIDGETMODULE_EXPORTS
	# define CEGUIWIDGETMODULE_API __declspec(dllexport)	# define CEGUIWIDGETMODULE_API __declspec(dllexport)
	# else	# else
	# define CEGUIWIDGETMODULE_API __declspec(dllimport)	# define CEGUIWIDGETMODULE_API __declspec(dllimport)
	# endif	# endif
	#else	#else
	# define CEGUIWIDGETMODULE_API	# define CEGUIWIDGETMODULE_API
	#endif	#endif

	#define CEGUI_DECLARE_WIDGET_MODULE( moduleName )\	#define CEGUI_DECLARE_WIDGET_MODULE( moduleName )\

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	CEGUIWindow.h	CEGUIWindow.h

	skipping to change at line 126	skipping to change at line 126
	class CEGUIEXPORT Window : public PropertySet, public EventSet	class CEGUIEXPORT Window : public PropertySet, public EventSet
	{	{
	public:	public:
	/******************************************************************** *	/******************************************************************** *
	Event name constants	Event name constants
	********************************************************************* /	********************************************************************* /
	//!< Namespace for global events	//!< Namespace for global events
	static const String EventNamespace;	static const String EventNamespace;

	// generated internally by Window	// generated internally by Window

		static const String EventWindowUpdated; //!< Event to signal the win dow is being updated. Used by lua system!
	//! Parent of this Window has been re-sized.	//! Parent of this Window has been re-sized.
	static const String EventParentSized;	static const String EventParentSized;
	//! Window size has changed	//! Window size has changed
	static const String EventSized;	static const String EventSized;
	//! Window position has changed	//! Window position has changed
	static const String EventMoved;	static const String EventMoved;
	//! Text string for the Window has changed	//! Text string for the Window has changed
	static const String EventTextChanged;	static const String EventTextChanged;
	//!Font object for the Window has been changed	//!Font object for the Window has been changed
	static const String EventFontChanged;	static const String EventFontChanged;

	skipping to change at line 267	skipping to change at line 268

	/*!	/*!
	\brief	\brief
	return a String object holding the name of this Window.	return a String object holding the name of this Window.

	\return	\return
	String object holding the unique Window name.	String object holding the unique Window name.
	*/	*/
	const String& getName(void) const {return d_name;}	const String& getName(void) const {return d_name;}


		/**
		* Return a string to the window prefix
		* \return String object holding the prefix of this window
		*/
		const String& getPrefix(void) const {return d_windowPrefix;}

	/*!	/*!
	\brief	\brief
	returns whether or not this Window is set to be destroyed when its	returns whether or not this Window is set to be destroyed when its
	parent window is destroyed.	parent window is destroyed.

	\return	\return
	- true if the Window will be destroyed when its parent is destroyed .	- true if the Window will be destroyed when its parent is destroyed .
	- false if the Window will remain when its parent is destroyed.	- false if the Window will remain when its parent is destroyed.
	*/	*/
	bool isDestroyedByParent(void) const {return d_destroyedByParent; }	bool isDestroyedByParent(void) const {return d_destroyedByParent; }

	skipping to change at line 458	skipping to change at line 465

	\return	\return
	Pointer to the Window object attached to this window that has the n ame	Pointer to the Window object attached to this window that has the n ame
	\a name.	\a name.

	\exception UnknownObjectException	\exception UnknownObjectException
	thrown if no window named \a name is attached to this Window.	thrown if no window named \a name is attached to this Window.
	*/	*/
	Window* getChild(const String& name) const;	Window* getChild(const String& name) const;


		Window* recursiveChildSearch(const String& name) const;

	/*!	/*!
	\brief	\brief
	return a pointer to the first attached child window with the specif ied	return a pointer to the first attached child window with the specif ied
	ID value.	ID value.

	This function will throw an exception if no child object with the g iven	This function will throw an exception if no child object with the g iven
	ID is attached. This decision was made (over returning NULL if no	ID is attached. This decision was made (over returning NULL if no
	window was found) so that client code can assume that if the call	window was found) so that client code can assume that if the call
	returns it has a valid window pointer. We provide the isChild()	returns it has a valid window pointer. We provide the isChild()
	functions for checking if a given window is attached.	functions for checking if a given window is attached.

	skipping to change at line 1223	skipping to change at line 1232

	// obtain an iterator for the PropertySet	// obtain an iterator for the PropertySet
	PropertySet::Iterator prp_iter = myWindow->PropertySet::getIterator ();	PropertySet::Iterator prp_iter = myWindow->PropertySet::getIterator ();
	\endcode	\endcode

	\return	\return
	PropertySet::Iterator object.	PropertySet::Iterator object.
	*/	*/
	PropertySet::Iterator getPropertyIterator() const;	PropertySet::Iterator getPropertyIterator() const;


		/*!
		\brief
		Returns whether this Window object will receive events generated by
		the drag and drop support in the system.

		\return
		- true if the Window is enabled as a drag and drop target.
		- false if the window is not enabled as a drag and drop target.
		*/
		bool isDragDropTarget() const;

	/******************************************************************** *	/******************************************************************** *
	Manipulator functions	Manipulator functions
	********************************************************************* /	********************************************************************* /
	/*!	/*!
	\brief	\brief
	Renames the window.	Renames the window.

	\param new_name	\param new_name
	String object holding the new name for the window.	String object holding the new name for the window.


	skipping to change at line 1320	skipping to change at line 1340
	void disable(void) {setEnabled(false);}	void disable(void) {setEnabled(false);}

	/*!	/*!
	\brief	\brief
	Set whether the Window is visible or hidden.	Set whether the Window is visible or hidden.

	\param setting	\param setting
	- true to make the Window visible.	- true to make the Window visible.
	- false to make the Window hidden.	- false to make the Window hidden.


		\note
		Hiding the active window will cause that window to become deactivat
		ed.
		Showing a window does not, however, automatically cause that window
		to
		become the active window (call Window::activate after making the wi
		ndow
		visible to activate it).

	\return	\return
	Nothing	Nothing
	*/	*/
	void setVisible(bool setting);	void setVisible(bool setting);

	/*!	/*!
	\brief	\brief

	show the Window	show the Window.

		\note
		Showing a window does not automatically activate the window. If yo
		u
		want the window to also become active you will need to call the
		Window::activate member also.

	\return	\return
	Nothing	Nothing
	*/	*/
	void show(void) {setVisible(true);}	void show(void) {setVisible(true);}

	/*!	/*!
	\brief	\brief
	hide the Window.	hide the Window.

		\note
		If the window is the active window, it will become deactivated as a
		result of being hidden.

	\return	\return
	Nothing	Nothing
	*/	*/
	void hide(void) {setVisible(false);}	void hide(void) {setVisible(false);}

	/*!	/*!
	\brief	\brief
	Activate the Window giving it input focus and bringing it to the to p of	Activate the Window giving it input focus and bringing it to the to p of
	all windows with the same always-on-top settig as this Window.	all windows with the same always-on-top settig as this Window.

	skipping to change at line 1391	skipping to change at line 1425

	\param ID	\param ID
	Client assigned ID code for this Window. The GUI system assigns no	Client assigned ID code for this Window. The GUI system assigns no
	meaning to any IDs, they are a device purely for client code usage.	meaning to any IDs, they are a device purely for client code usage.

	\return	\return
	Nothing	Nothing
	*/	*/
	void setID(uint ID);	void setID(uint ID);


		/**
		* Sets the unique prefix for this window.
		* \param prefix String object holding the prefix to be used on this
		window.
		*/
		void setPrefix(String prefix) { d_windowPrefix = prefix;}

	/*!	/*!
	\brief	\brief
	Set the current text string for the Window.	Set the current text string for the Window.

	\param text	\param text
	String object containing the text that is to be set as the Window t ext.	String object containing the text that is to be set as the Window t ext.

	\return	\return
	Nothing	Nothing
	*/	*/
	void setText(const String& text);	void setText(const String& text);

	/*!	/*!
	\brief	\brief

		Insert the text string \a text into the current text string for the
		Window object at the position specified by \a position.

		\param text
		String object holding the text that is to be inserted into the Wind
		ow
		object's current text string.

		\param position
		The characted index position where the string \a text should be
		inserted.
		*/
		void insertText(const String& text, const String::size_type position);

		/*!
		\brief
		Append the string \a text to the currect text string for the Window
		object.

		\param text
		String object holding the text that is to be appended to the Window
		object's current text string.
		*/
		void appendText(const String& text);

		/*!
		\brief
	Set the font used by this Window.	Set the font used by this Window.

	\param font	\param font
	Pointer to the Font object to be used by this Window.	Pointer to the Font object to be used by this Window.
	If \a font is NULL, the default font will be used.	If \a font is NULL, the default font will be used.

	\return	\return
	Nothing	Nothing
	*/	*/
	void setFont(Font* font);	void setFont(Font* font);

	skipping to change at line 1937	skipping to change at line 2003

	\return	\return
	Nothing.	Nothing.

	\exception UnknownObjectException	\exception UnknownObjectException
	thrown if the look'n'feel specified by \a look does not exist.	thrown if the look'n'feel specified by \a look does not exist.

	\note	\note
	Once a look'n'feel has been assigned it is locked - as in cannot be changed.	Once a look'n'feel has been assigned it is locked - as in cannot be changed.
	*/	*/

	void setLookNFeel(const String& look);	virtual void setLookNFeel(const String& look);

	/*!	/*!
	\brief	\brief
	Set the modal state for this Window.	Set the modal state for this Window.

	\param state	\param state
	Boolean value defining if this Window should be the modal target.	Boolean value defining if this Window should be the modal target.
	- true if this Window should be activated and set as the modal targ et.	- true if this Window should be activated and set as the modal targ et.
	- false if the modal target should be cleared if this Window is	- false if the modal target should be cleared if this Window is
	currently the modal target.	currently the modal target.

	skipping to change at line 2472	skipping to change at line 2538
	Sets whether this window is allowed to write XML	Sets whether this window is allowed to write XML
	*/	*/
	void setWritingXMLAllowed(bool allow) {d_allowWriteXML = allow;}	void setWritingXMLAllowed(bool allow) {d_allowWriteXML = allow;}

	/*!	/*!
	\brief	\brief
	Recursively inform all children that the screen area has changed, a nd needs to be re-cached	Recursively inform all children that the screen area has changed, a nd needs to be re-cached
	*/	*/
	void notifyScreenAreaChanged(void);	void notifyScreenAreaChanged(void);


		/*!
		\brief
		Changes the widget's falagard type, thus changing its look'n'feel a
		nd optionally its
		renderer in the process.

		\param type
		New look'n'feel of the widget

		\param type
		New renderer of the widget
		*/
		void setFalagardType(const String& type, const String& rendererType = "
		");

		/*!
		\brief
		Specifies whether this Window object will receive events generated
		by
		the drag and drop support in the system.

		\param setting
		- true to enable the Window as a drag and drop target.
		- false to disable the Window as a drag and drop target.
		*/
		void setDragDropTarget(bool setting);

	protected:	protected:
	/******************************************************************** *	/******************************************************************** *
	System object can trigger events directly	System object can trigger events directly
	********************************************************************* /	********************************************************************* /
	friend class System;	friend class System;

	/******************************************************************** *	/******************************************************************** *
	Event trigger methods	Event trigger methods
	********************************************************************* /	********************************************************************* /
	/*!	/*!

	skipping to change at line 3225	skipping to change at line 3315
	//! implements repeating - tracks time elapsed.	//! implements repeating - tracks time elapsed.
	float d_repeatElapsed;	float d_repeatElapsed;

	/*!	/*!
	\brief	\brief
	Button we're tracking (implication of this is that we only support one	Button we're tracking (implication of this is that we only support one
	button at a time).	button at a time).
	*/	*/
	MouseButton d_repeatButton;	MouseButton d_repeatButton;


		//! true if window will receive drag and drop related notifications
		bool d_dragDropTarget;

	// Tooltip stuff	// Tooltip stuff
	//! Text string used as tip for this window.	//! Text string used as tip for this window.
	String d_tooltipText;	String d_tooltipText;
	//! Possible custom Tooltip for this window.	//! Possible custom Tooltip for this window.
	Tooltip* d_customTip;	Tooltip* d_customTip;
	//! true if this Window created the custom Tooltip.	//! true if this Window created the custom Tooltip.
	bool d_weOwnTip;	bool d_weOwnTip;
	/*!	/*!
	\brief	\brief
	true if the Window inherits tooltip text from its parent (when none set	true if the Window inherits tooltip text from its parent (when none set

	skipping to change at line 3331	skipping to change at line 3424
	static WindowProperties::UnifiedXPosition d_unifiedXPositionProperty;	static WindowProperties::UnifiedXPosition d_unifiedXPositionProperty;
	static WindowProperties::UnifiedYPosition d_unifiedYPositionProperty;	static WindowProperties::UnifiedYPosition d_unifiedYPositionProperty;
	static WindowProperties::UnifiedSize d_unifiedSizeProperty;	static WindowProperties::UnifiedSize d_unifiedSizeProperty;
	static WindowProperties::UnifiedWidth d_unifiedWidthProperty;	static WindowProperties::UnifiedWidth d_unifiedWidthProperty;
	static WindowProperties::UnifiedHeight d_unifiedHeightProperty;	static WindowProperties::UnifiedHeight d_unifiedHeightProperty;
	static WindowProperties::UnifiedMinSize d_unifiedMinSizeProperty;	static WindowProperties::UnifiedMinSize d_unifiedMinSizeProperty;
	static WindowProperties::UnifiedMaxSize d_unifiedMaxSizeProperty;	static WindowProperties::UnifiedMaxSize d_unifiedMaxSizeProperty;
	static WindowProperties::MousePassThroughEnabled d_mousePassThroughE nabledProperty;	static WindowProperties::MousePassThroughEnabled d_mousePassThroughE nabledProperty;
	static WindowProperties::WindowRenderer d_windowRendererProperty;	static WindowProperties::WindowRenderer d_windowRendererProperty;
	static WindowProperties::LookNFeel d_lookNFeelProperty;	static WindowProperties::LookNFeel d_lookNFeelProperty;

		static WindowProperties::DragDropTarget d_dragDropTargetProperty;

	/******************************************************************** *	/******************************************************************** *
	implementation functions	implementation functions
	********************************************************************* /	********************************************************************* /
	/*!	/*!
	\brief	\brief
	Cleanup child windows	Cleanup child windows
	*/	*/
	virtual void cleanupChildren(void);	virtual void cleanupChildren(void);


	skipping to change at line 3368	skipping to change at line 3462

	/*!	/*!
	\brief	\brief
	Add standard CEGUI::Window properties.	Add standard CEGUI::Window properties.
	*/	*/
	void addStandardProperties(void);	void addStandardProperties(void);

	/*!	/*!
	\brief	\brief
	Implements move to front behavior.	Implements move to front behavior.


		\return
		Should return true if some action was taken, or false if there was
		nothing to be done.
	*/	*/

	virtual void moveToFront_impl(bool wasClicked);	virtual bool moveToFront_impl(bool wasClicked);

	/*!	/*!
	\brief	\brief
	Implementation of rise on click functionality.	Implementation of rise on click functionality.


		\return
		true if we did something, false if there was nothing to do.
	*/	*/

	void doRiseOnClick(void);	bool doRiseOnClick(void);

	/*!	/*!
	\brief	\brief
	Implementation method to modify window area while correctly applyin g	Implementation method to modify window area while correctly applyin g
	min / max size processing, and firing any appropriate events.	min / max size processing, and firing any appropriate events.

	/note	/note
	This is the implementation function for setting size and position.	This is the implementation function for setting size and position.
	In order to simplify area management, from this point on, all	In order to simplify area management, from this point on, all
	modifications to window size and position (area rect) should come	modifications to window size and position (area rect) should come

	skipping to change at line 3443	skipping to change at line 3544
	to the drawing list then nothing happens.	to the drawing list then nothing happens.

	\param wnd	\param wnd
	Window object to be removed from the drawing list.	Window object to be removed from the drawing list.

	\return	\return
	Nothing.	Nothing.
	*/	*/
	void removeWindowFromDrawList(const Window& wnd);	void removeWindowFromDrawList(const Window& wnd);


		/*!
		\brief
		Return whether the window is at the top of the Z-Order. This will
		correctly take into account 'Always on top' windows as needed.

		\return
		- true if the Window is at the top of the z-order in relation to si
		bling
		windows with the same 'always on top' setting.
		- false if the Window is not at the top of the z-order in relation
		to
		sibling windows with the same 'always on top' setting.
		*/
		bool isTopOfZOrder() const;

	virtual int writePropertiesXML(XMLSerializer& xml_stream) const;	virtual int writePropertiesXML(XMLSerializer& xml_stream) const;
	virtual int writeChildWindowsXML(XMLSerializer& xml_stream) const;	virtual int writeChildWindowsXML(XMLSerializer& xml_stream) const;
	virtual bool writeAutoChildWindowXML(XMLSerializer& xml_stream) const;	virtual bool writeAutoChildWindowXML(XMLSerializer& xml_stream) const;

	/******************************************************************** *	/******************************************************************** *
	May not copy or assign Window objects	May not copy or assign Window objects
	********************************************************************* /	********************************************************************* /
	Window(const Window& wnd) : PropertySet(), EventSet() {}	Window(const Window& wnd) : PropertySet(), EventSet() {}
	Window& operator=(const Window& wnd) {return *this;}	Window& operator=(const Window& wnd) {return *this;}


	skipping to change at line 3469	skipping to change at line 3583
	(is also the name of the WindowFactory that created us)	(is also the name of the WindowFactory that created us)
	*/	*/
	const String d_type;	const String d_type;

	//! The name of the window (GUI system unique).	//! The name of the window (GUI system unique).
	String d_name;	String d_name;

	//! Type name of the window as defined in a Falagard mapping.	//! Type name of the window as defined in a Falagard mapping.
	String d_falagardType;	String d_falagardType;


		//! The prefix used on this window (if any) when created instanced w
		indows.
		String d_windowPrefix;

	friend class WindowManager;	friend class WindowManager;
	};	};

	} // End of CEGUI namespace section	} // End of CEGUI namespace section

	#if defined(_MSC_VER)	#if defined(_MSC_VER)
	# pragma warning(pop)	# pragma warning(pop)
	#endif	#endif

	#endif // end of guard _CEGUIWindow_h_	#endif // end of guard _CEGUIWindow_h_

End of changes. 19 change blocks.
	4 lines changed or deleted	133 lines changed or added

	CEGUIWindowManager.h	CEGUIWindowManager.h

	skipping to change at line 133	skipping to change at line 133
	String that holds a unique name that is to be given to the n ew window. If this string is empty (""), a name	String that holds a unique name that is to be given to the n ew window. If this string is empty (""), a name
	will be generated for the window.	will be generated for the window.

	\return	\return
	Pointer to the newly created Window object.	Pointer to the newly created Window object.

	\exception AlreadyExistsException A Window object with the name \a name already exists.	\exception AlreadyExistsException A Window object with the name \a name already exists.
	\exception UnknownObjectException No WindowFactory is registered for \a type Window objects.	\exception UnknownObjectException No WindowFactory is registered for \a type Window objects.
	\exception GenericException Some other e rror occurred (Exception message has details).	\exception GenericException Some other e rror occurred (Exception message has details).
	*/	*/

	Window* createWindow(const String& type, const String& name = "");	Window* createWindow(const String& type, const String& name = "", co nst String& prefix = "");

	/*!	/*!
	\brief	\brief
	Destroy the specified Window object.	Destroy the specified Window object.

	\param window	\param window
	Pointer to the Window object to be destroyed. If the \a win dow is null, or is not recognised, nothing happens.	Pointer to the Window object to be destroyed. If the \a win dow is null, or is not recognised, nothing happens.

	\return	\return
	Nothing	Nothing

	skipping to change at line 232	skipping to change at line 232
	Client code data pointer passed to the PropertyCallback func tion.	Client code data pointer passed to the PropertyCallback func tion.

	\return	\return
	Pointer to the root Window object defined in the layout.	Pointer to the root Window object defined in the layout.

	\exception FileIOException thrown if something goes wrong while processing the file \a filename.	\exception FileIOException thrown if something goes wrong while processing the file \a filename.
	\exception InvalidRequestException thrown if \a filename appear s to be invalid.	\exception InvalidRequestException thrown if \a filename appear s to be invalid.
	*/	*/
	Window* loadWindowLayout(const String& filename, const String& name_ prefix = "", const String& resourceGroup = "", PropertyCallback* callback = 0, void* userdata = 0);	Window* loadWindowLayout(const String& filename, const String& name_ prefix = "", const String& resourceGroup = "", PropertyCallback* callback = 0, void* userdata = 0);


		Window* loadWindowLayout(const String& filename, bool generateRandom
		Prefix);

	/*!	/*!
	\brief	\brief
	Return whether the window dead pool is empty.	Return whether the window dead pool is empty.

	\return	\return
	- true if there are no windows in the dead pool.	- true if there are no windows in the dead pool.
	- false if the dead pool contains >=1 window awaiting destruction.	- false if the dead pool contains >=1 window awaiting destruction.
	*/	*/
	bool isDeadPoolEmpty(void) const;	bool isDeadPoolEmpty(void) const;


	skipping to change at line 360	skipping to change at line 362
	private:	private:
	/******************************************************************** *	/******************************************************************** *
	Implementation Methods	Implementation Methods
	********************************************************************* /	********************************************************************* /
	/*!	/*!
	\brief	\brief
	Implementation method to generate a unique name to use for a window .	Implementation method to generate a unique name to use for a window .
	*/	*/
	String generateUniqueWindowName();	String generateUniqueWindowName();


		String generateUniqueWindowPrefix();

	/***************************************************************** ****	/***************************************************************** ****
	Implementation Constants	Implementation Constants
	****************************************************************** ***/	****************************************************************** ***/
	static const char GUILayoutSchemaName[]; //!< Filename of the XML schema used for validating GUILayout files.	static const char GUILayoutSchemaName[]; //!< Filename of the XML schema used for validating GUILayout files.

	/***************************************************************** ****	/***************************************************************** ****
	Implementation Data	Implementation Data
	****************************************************************** ***/	****************************************************************** ***/
	typedef std::map<String, Window*, String::FastLessCompare> WindowRegistry; //!< Type used to imple ment registry of Window objects	typedef std::map<String, Window*, String::FastLessCompare> WindowRegistry; //!< Type used to imple ment registry of Window objects
	typedef std::vector<Window*> WindowVector; //!< Type to use for a collection of Window pointers.	typedef std::vector<Window*> WindowVector; //!< Type to use for a collection of Window pointers.

	skipping to change at line 388	skipping to change at line 392
	/***************************************************************** ****	/***************************************************************** ****
	Iterator stuff	Iterator stuff
	****************************************************************** ***/	****************************************************************** ***/
	typedef ConstBaseIterator<WindowRegistry> WindowIterator;	typedef ConstBaseIterator<WindowRegistry> WindowIterator;

	/*!	/*!
	\brief	\brief
	Return a WindowManager::WindowIterator object to iterate ove r the currently defined Windows.	Return a WindowManager::WindowIterator object to iterate ove r the currently defined Windows.
	*/	*/
	WindowIterator getIterator(void) const;	WindowIterator getIterator(void) const;


		/*!
		\brief
		Outputs the names of ALL existing windows to log (DEBUG function).

		\param zone
		Helper string that can specify where the name dump was made (e.g. "BEFO
		RE FRAME DELETION").

		\return
		Nothing.
		*/
		void DEBUG_dumpWindowNames(String zone);
	};	};

	} // End of CEGUI namespace section	} // End of CEGUI namespace section

	#if defined(_MSC_VER)	#if defined(_MSC_VER)
	# pragma warning(pop)	# pragma warning(pop)
	#endif	#endif

	#endif // end of guard _CEGUIWindowManager_h_	#endif // end of guard _CEGUIWindowManager_h_

End of changes. 4 change blocks.
	1 lines changed or deleted	19 lines changed or added

	CEGUIWindowProperties.h	CEGUIWindowProperties.h

	skipping to change at line 997	skipping to change at line 997
	"Property to get/set the windows assigned look'n'feel. Value is a string.",	"Property to get/set the windows assigned look'n'feel. Value is a string.",
	"")	"")
	{}	{}

	String get(const PropertyReceiver* receiver) const;	String get(const PropertyReceiver* receiver) const;
	void set(PropertyReceiver* receiver, const String& value);	void set(PropertyReceiver* receiver, const String& value);

	void writeXMLToStream(const PropertyReceiver* receiver, XMLSerializ er& xml_stream) const;	void writeXMLToStream(const PropertyReceiver* receiver, XMLSerializ er& xml_stream) const;
	};	};


		/*!
		\brief
		Property to get/set whether the Window will receive drag and drop relat
		ed
		notifications.

		\par Usage:
		- Name: DragDropTarget
		- Format: "[text]".

		\par Where [Text] is:
		- "True" if Window is will receive drag & drop notifications.
		- "False" if Window is will not receive drag & drop notifications.
		*/
		class DragDropTarget : public Property
		{
		public:
		DragDropTarget() : Property(
		"DragDropTarget",
		"Property to get/set whether the Window will receive drag and drop
		related notifications. Value is either \"True\" or \"False\".",
		"True")
		{}

		String get(const PropertyReceiver* receiver) const;
		void set(PropertyReceiver* receiver, const String& value);
		};

	} // End of WindowProperties namespace section	} // End of WindowProperties namespace section

	} // End of CEGUI namespace section	} // End of CEGUI namespace section

	#endif // end of guard _CEGUIWindowProperties_h_	#endif // end of guard _CEGUIWindowProperties_h_

End of changes. 1 change blocks.
	0 lines changed or deleted	28 lines changed or added

	CEGUIWindowRendererModule.h	CEGUIWindowRendererModule.h

	skipping to change at line 36	skipping to change at line 36
	* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR	* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
	* OTHER DEALINGS IN THE SOFTWARE.	* OTHER DEALINGS IN THE SOFTWARE.
	************************************************************************** */	************************************************************************** */
	#ifndef _CEGUIWindowRendererModule_h_	#ifndef _CEGUIWindowRendererModule_h_
	#define _CEGUIWindowRendererModule_h_	#define _CEGUIWindowRendererModule_h_

	#include "CEGUIExceptions.h"	#include "CEGUIExceptions.h"
	#include "CEGUIWindowRendererManager.h"	#include "CEGUIWindowRendererManager.h"
	#include "CEGUILogger.h"	#include "CEGUILogger.h"


	#if defined( __WIN32__ ) \|\| defined( _WIN32 )	#if (defined( __WIN32__ ) \|\| defined( _WIN32 )) && !defined(CEGUI_STATIC)
	# ifdef CEGUIWRMODULE_EXPORTS	# ifdef CEGUIWRMODULE_EXPORTS
	# define CEGUIWRMODULE_API __declspec(dllexport)	# define CEGUIWRMODULE_API __declspec(dllexport)
	# else	# else
	# define CEGUIWRMODULE_API __declspec(dllimport)	# define CEGUIWRMODULE_API __declspec(dllimport)
	# endif	# endif
	#else	#else
	# define CEGUIWRMODULE_API	# define CEGUIWRMODULE_API
	#endif	#endif

	// declare module	// declare module
	#define CEGUI_DECLARE_WR_MODULE( moduleName )\	#define CEGUI_DECLARE_WR_MODULE( moduleName )\
	\	\
	class CEGUI::WindowRendererFactory;\	class CEGUI::WindowRendererFactory;\
	\	\

	extern "C" CEGUIWRMODULE_API void registerFactory(const CEGUI::String& type	extern "C" CEGUIWRMODULE_API void registerFactoryFunction(const CEGUI::Stri
	_name);\	ng& type_name);\
	extern "C" CEGUIWRMODULE_API CEGUI::uint registerAllFactories(void);\	extern "C" CEGUIWRMODULE_API CEGUI::uint registerAllFactoriesFunction(void)
		;\
	void doSafeFactoryRegistration(CEGUI::WindowRendererFactory* factory);	void doSafeFactoryRegistration(CEGUI::WindowRendererFactory* factory);

	// define factory	// define factory
	#define CEGUI_DEFINE_WR_FACTORY( className )\	#define CEGUI_DEFINE_WR_FACTORY( className )\
	namespace CEGUI {\	namespace CEGUI {\
	class className ## WRFactory : public WindowRendererFactory\	class className ## WRFactory : public WindowRendererFactory\
	{\	{\
	public:\	public:\
	className ## WRFactory(void) : WindowRendererFactory(className::TypeNam e) { }\	className ## WRFactory(void) : WindowRendererFactory(className::TypeNam e) { }\
	WindowRenderer* create(void)\	WindowRenderer* create(void)\

	skipping to change at line 90	skipping to change at line 90

	// end factory map	// end factory map
	#define CEGUI_END_WR_FACTORY_MAP {0,0}};	#define CEGUI_END_WR_FACTORY_MAP {0,0}};

	// map entry	// map entry
	#define CEGUI_WR_FACTORY_MAP_ENTRY( class )\	#define CEGUI_WR_FACTORY_MAP_ENTRY( class )\
	{CEGUI::class::TypeName, &s_ ## class ## WRFactory},	{CEGUI::class::TypeName, &s_ ## class ## WRFactory},

	// define module	// define module
	#define CEGUI_DEFINE_WR_MODULE( module )\	#define CEGUI_DEFINE_WR_MODULE( module )\

	extern "C" void registerFactory(const CEGUI::String& type_name)\	void registerFactoryFunction(const CEGUI::String& type_name)\
	{\	{\
	module ## WRMapEntry* entry = module ## WRFactoriesMap;\	module ## WRMapEntry* entry = module ## WRFactoriesMap;\
	while (entry->d_name)\	while (entry->d_name)\
	{\	{\
	if (entry->d_name == type_name)\	if (entry->d_name == type_name)\
	{\	{\
	doSafeFactoryRegistration(entry->d_factory);\	doSafeFactoryRegistration(entry->d_factory);\
	return;\	return;\
	}\	}\
	++entry;\	++entry;\
	}\	}\
	\	\
	throw CEGUI::UnknownObjectException("::registerFactory - The window ren derer factory for type '" + type_name + "' is not known in this module.");\	throw CEGUI::UnknownObjectException("::registerFactory - The window ren derer factory for type '" + type_name + "' is not known in this module.");\
	}\	}\
	\	\

	extern "C" CEGUI::uint registerAllFactories(void)\	extern "C" CEGUI::uint registerAllFactoriesFunction(void)\
	{\	{\
	CEGUI::uint count = 0;\	CEGUI::uint count = 0;\
	module ## WRMapEntry* entry = module ## WRFactoriesMap;\	module ## WRMapEntry* entry = module ## WRFactoriesMap;\
	while (entry->d_name)\	while (entry->d_name)\
	{\	{\
	doSafeFactoryRegistration(entry->d_factory);\	doSafeFactoryRegistration(entry->d_factory);\
	++entry;\	++entry;\
	++count;\	++count;\
	}\	}\
	return count;\	return count;\

End of changes. 4 change blocks.
	6 lines changed or deleted	7 lines changed or added

	CEGUIXercesParser.h	CEGUIXercesParser.h

	skipping to change at line 33	skipping to change at line 33
	* IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR	* IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
	* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,	* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
	* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR	* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
	* OTHER DEALINGS IN THE SOFTWARE.	* OTHER DEALINGS IN THE SOFTWARE.
	************************************************************************** */	************************************************************************** */
	#ifndef _CEGUIXercesParser_h_	#ifndef _CEGUIXercesParser_h_
	#define _CEGUIXercesParser_h_	#define _CEGUIXercesParser_h_

	#include "CEGUIXMLParser.h"	#include "CEGUIXMLParser.h"


	#if defined( __WIN32__ ) \|\| defined( _WIN32 )	#if (defined( __WIN32__ ) \|\| defined( _WIN32 )) && !defined(CEGUI_STATIC)
	# ifdef CEGUIXERCESPARSER_EXPORTS	# ifdef CEGUIXERCESPARSER_EXPORTS
	# define CEGUIXERCESPARSER_API __declspec(dllexport)	# define CEGUIXERCESPARSER_API __declspec(dllexport)
	# else	# else
	# define CEGUIXERCESPARSER_API __declspec(dllimport)	# define CEGUIXERCESPARSER_API __declspec(dllimport)
	# endif	# endif
	#else	#else
	# define CEGUIXERCESPARSER_API	# define CEGUIXERCESPARSER_API
	#endif	#endif

	// Xerces-C includes	// Xerces-C includes

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	openglrenderer.h	openglrenderer.h

	skipping to change at line 36	skipping to change at line 36
	* IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR	* IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
	* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,	* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
	* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR	* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
	* OTHER DEALINGS IN THE SOFTWARE.	* OTHER DEALINGS IN THE SOFTWARE.
	************************************************************************** */	************************************************************************** */
	#ifndef _openglrenderer_h_	#ifndef _openglrenderer_h_
	#define _openglrenderer_h_	#define _openglrenderer_h_

	#include "CEGUIBase.h"	#include "CEGUIBase.h"


	#if defined( __WIN32__ ) \|\| defined( _WIN32 )	#if (defined( __WIN32__ ) \|\| defined( _WIN32 )) && !defined(CEGUI_STATIC)
	# ifdef OPENGL_GUIRENDERER_EXPORTS	# ifdef OPENGL_GUIRENDERER_EXPORTS
	# define OPENGL_GUIRENDERER_API __declspec(dllexport)	# define OPENGL_GUIRENDERER_API __declspec(dllexport)
	# else	# else
	# define OPENGL_GUIRENDERER_API __declspec(dllimport)	# define OPENGL_GUIRENDERER_API __declspec(dllimport)
	# endif	# endif
	#else	#else
	# define OPENGL_GUIRENDERER_API	# define OPENGL_GUIRENDERER_API
	#endif	#endif

	#if defined(_WIN32)// All this taken from glut.h	#if defined(_WIN32)// All this taken from glut.h

	skipping to change at line 95	skipping to change at line 95
	#else /* __APPLE__ */	#else /* __APPLE__ */
	#include <GL/gl.h>	#include <GL/gl.h>
	#include <GL/glu.h>	#include <GL/glu.h>
	#endif /* __APPLE__ */	#endif /* __APPLE__ */
	#include <list>	#include <list>
	#include <set>	#include <set>

	#include "CEGUIRenderer.h"	#include "CEGUIRenderer.h"
	#include "CEGUITexture.h"	#include "CEGUITexture.h"


	#if defined(_WIN32)	// #if defined(_WIN32)
	# if defined(_DEBUG)	// # if defined(_DEBUG)
	# pragma comment(lib, "CEGUIBase_d.lib")	// # pragma comment(lib, "CEGUIBase_d.lib")
	# else	// # else
	# pragma comment(lib, "CEGUIBase.lib")	// # pragma comment(lib, "CEGUIBase.lib")
	# endif	// # endif
	#endif	// #endif

	#if defined(_MSC_VER)	#if defined(_MSC_VER)
	# pragma warning(push)	# pragma warning(push)
	# pragma warning(disable : 4251)	# pragma warning(disable : 4251)
	#endif	#endif

	#define OGLRENDERER_VBUFF_CAPACITY 4096	#define OGLRENDERER_VBUFF_CAPACITY 4096

	// Start of CEGUI namespace section	// Start of CEGUI namespace section
	namespace CEGUI	namespace CEGUI

End of changes. 2 change blocks.
	8 lines changed or deleted	8 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/

	CEGUI.h	CEGUI.h

	skipping to change at line 60	skipping to change at line 60
	#include "CEGUIProperty.h"	#include "CEGUIProperty.h"
	#include "CEGUIPropertySet.h"	#include "CEGUIPropertySet.h"
	#include "CEGUIWindow.h"	#include "CEGUIWindow.h"
	#include "CEGUIWindowFactory.h"	#include "CEGUIWindowFactory.h"
	#include "CEGUIWindowFactoryManager.h"	#include "CEGUIWindowFactoryManager.h"
	#include "CEGUIWindowManager.h"	#include "CEGUIWindowManager.h"
	#include "CEGUIWindowRenderer.h"	#include "CEGUIWindowRenderer.h"
	#include "CEGUIWindowRendererManager.h"	#include "CEGUIWindowRendererManager.h"
	#include "CEGUIScheme.h"	#include "CEGUIScheme.h"
	#include "CEGUISchemeManager.h"	#include "CEGUISchemeManager.h"

		#include "CEGUIScriptWindowHelper.h"
	#include "CEGUISystem.h"	#include "CEGUISystem.h"
	#include "CEGUIScriptModule.h"	#include "CEGUIScriptModule.h"
	#include "CEGUICoordConverter.h"	#include "CEGUICoordConverter.h"
	#include "CEGUIPropertyHelper.h"	#include "CEGUIPropertyHelper.h"

	// Falagard core system include	// Falagard core system include
	#include "falagard/CEGUIFalWidgetLookManager.h"	#include "falagard/CEGUIFalWidgetLookManager.h"

	// gui elements	// gui elements
	#include "elements/CEGUIButtonBase.h"	#include "elements/CEGUIButtonBase.h"

	skipping to change at line 103	skipping to change at line 104
	#include "elements/CEGUIScrollablePane.h"	#include "elements/CEGUIScrollablePane.h"
	#include "elements/CEGUITooltip.h"	#include "elements/CEGUITooltip.h"
	#include "elements/CEGUIItemEntry.h"	#include "elements/CEGUIItemEntry.h"
	#include "elements/CEGUIMenuItem.h"	#include "elements/CEGUIMenuItem.h"
	#include "elements/CEGUIItemListBase.h"	#include "elements/CEGUIItemListBase.h"
	#include "elements/CEGUIMenuBase.h"	#include "elements/CEGUIMenuBase.h"
	#include "elements/CEGUIMenubar.h"	#include "elements/CEGUIMenubar.h"
	#include "elements/CEGUIPopupMenu.h"	#include "elements/CEGUIPopupMenu.h"
	#include "elements/CEGUIScrolledItemListBase.h"	#include "elements/CEGUIScrolledItemListBase.h"
	#include "elements/CEGUIItemListbox.h"	#include "elements/CEGUIItemListbox.h"

		#include "elements/CEGUITree.h"
		#include "elements/CEGUITreeItem.h"
		#include "elements/CEGUIGroupBox.h"

	#endif // end of guard _CEGUI_h_	#endif // end of guard _CEGUI_h_

End of changes. 2 change blocks.
	0 lines changed or deleted	4 lines changed or added

	CEGUIComboDropList.h	CEGUIComboDropList.h

	skipping to change at line 175	skipping to change at line 175
	void onListSelectionAccepted(WindowEventArgs& e);	void onListSelectionAccepted(WindowEventArgs& e);

	/***************************************************************** ****	/***************************************************************** ****
	Overridden Event handling	Overridden Event handling
	****************************************************************** ***/	****************************************************************** ***/
	virtual void onMouseMove(MouseEventArgs& e);	virtual void onMouseMove(MouseEventArgs& e);
	virtual void onMouseButtonDown(MouseEventArgs& e);	virtual void onMouseButtonDown(MouseEventArgs& e);
	virtual void onMouseButtonUp(MouseEventArgs& e);	virtual void onMouseButtonUp(MouseEventArgs& e);
	virtual void onCaptureLost(WindowEventArgs& e);	virtual void onCaptureLost(WindowEventArgs& e);
	virtual void onActivated(ActivationEventArgs& e);	virtual void onActivated(ActivationEventArgs& e);

		virtual void onListContentsChanged(WindowEventArgs& e);
		virtual void onSelectionChanged(WindowEventArgs& e);

	/***************************************************************** ****	/***************************************************************** ****
	Implementation Data	Implementation Data
	****************************************************************** ***/	****************************************************************** ***/
	bool d_autoArm; //!< true if the box auto-arms when the mouse enters it.	bool d_autoArm; //!< true if the box auto-arms when the mouse enters it.
	bool d_armed; //!< true when item selection has be en armed.	bool d_armed; //!< true when item selection has be en armed.

		ListboxItem* d_lastClickSelected; //!< Item last accepted by user.
	};	};

	} // End of CEGUI namespace section	} // End of CEGUI namespace section

	#if defined(_MSC_VER)	#if defined(_MSC_VER)
	# pragma warning(pop)	# pragma warning(pop)
	#endif	#endif

	#endif // end of guard _CEGUIComboDropList_h_	#endif // end of guard _CEGUIComboDropList_h_

End of changes. 2 change blocks.
	0 lines changed or deleted	3 lines changed or added

	CEGUIDynamicModule.h	CEGUIDynamicModule.h

	skipping to change at line 38	skipping to change at line 38
	#ifndef _CEGUIDynamicModule_h_	#ifndef _CEGUIDynamicModule_h_
	#define _CEGUIDynamicModule_h_	#define _CEGUIDynamicModule_h_

	#include "CEGUIString.h"	#include "CEGUIString.h"

	/*************************************************************************	/*************************************************************************
	The following is basically taken from DynLib.h, which is part of	The following is basically taken from DynLib.h, which is part of
	the Ogre project (http://www.ogre3d.org/)	the Ogre project (http://www.ogre3d.org/)
	*************************************************************************/	*************************************************************************/
	#if defined(__WIN32__) \|\| defined(_WIN32)	#if defined(__WIN32__) \|\| defined(_WIN32)

	# define DYNLIB_HANDLE hInstance	# define DYNLIB_HANDLE hInstance
	# define DYNLIB_LOAD( a ) LoadLibrary( a )	# define DYNLIB_LOAD( a ) LoadLibrary( a )
	# define DYNLIB_GETSYM( a, b ) GetProcAddress( a, b )	# define DYNLIB_GETSYM( a, b ) GetProcAddress( a, b )
	# define DYNLIB_UNLOAD( a ) !FreeLibrary( a )	# define DYNLIB_UNLOAD( a ) !FreeLibrary( a )

	struct HINSTANCE__;	struct HINSTANCE__;
	typedef struct HINSTANCE__* hInstance;	typedef struct HINSTANCE__* hInstance;

	#elif defined(__linux__)	#elif defined(__linux__)
	# define DYNLIB_HANDLE void*	# define DYNLIB_HANDLE void*
	# define DYNLIB_LOAD( a ) dlopen( a, RTLD_LAZY )	# define DYNLIB_LOAD( a ) dlopen( a, RTLD_LAZY )
	# define DYNLIB_GETSYM( a, b ) dlsym( a, b )	# define DYNLIB_GETSYM( a, b ) dlsym( a, b )
	# define DYNLIB_UNLOAD( a ) dlclose( a )	# define DYNLIB_UNLOAD( a ) dlclose( a )
	# define DYNLIB_ERROR( ) dlerror( )	# define DYNLIB_ERROR( ) dlerror( )


End of changes. 1 change blocks.
	5 lines changed or deleted	4 lines changed or added

	CEGUIMultiColumnList.h	CEGUIMultiColumnList.h

	skipping to change at line 1337	skipping to change at line 1337

	// overrides function in base class.	// overrides function in base class.
	virtual bool validateWindowRenderer(const String& name) const	virtual bool validateWindowRenderer(const String& name) const
	{	{
	return (name == "MultiColumnList");	return (name == "MultiColumnList");
	}	}

	// overrides function in base class.	// overrides function in base class.
	int writePropertiesXML(XMLSerializer& xml_stream) const;	int writePropertiesXML(XMLSerializer& xml_stream) const;


		/*!
		\brief
		Causes the internal list to be (re)sorted.
		*/
		void resortList();

	/***************************************************************** ****	/***************************************************************** ****
	New event handlers for multi column list	New event handlers for multi column list
	****************************************************************** ***/	****************************************************************** ***/
	/*!	/*!
	\brief	\brief
	Handler called when the selection mode of the list box chang es	Handler called when the selection mode of the list box chang es
	*/	*/
	virtual void onSelectionModeChanged(WindowEventArgs& e);	virtual void onSelectionModeChanged(WindowEventArgs& e);

	/*!	/*!

	skipping to change at line 1409	skipping to change at line 1415

	/*!	/*!
	\brief	\brief
	Handler called when the column order is changed.	Handler called when the column order is changed.
	*/	*/
	virtual void onListColumnMoved(WindowEventArgs& e);	virtual void onListColumnMoved(WindowEventArgs& e);

	/***************************************************************** ****	/***************************************************************** ****
	Overridden Event handlers	Overridden Event handlers
	****************************************************************** ***/	****************************************************************** ***/

		virtual void onFontChanged(WindowEventArgs& e);
	virtual void onSized(WindowEventArgs& e);	virtual void onSized(WindowEventArgs& e);
	virtual void onMouseButtonDown(MouseEventArgs& e);	virtual void onMouseButtonDown(MouseEventArgs& e);
	virtual void onMouseWheel(MouseEventArgs& e);	virtual void onMouseWheel(MouseEventArgs& e);

	/***************************************************************** ****	/***************************************************************** ****
	Handlers for subscribed events	Handlers for subscribed events
	****************************************************************** ***/	****************************************************************** ***/
	bool handleHeaderScroll(const EventArgs& e);	bool handleHeaderScroll(const EventArgs& e);
	bool handleHeaderSegMove(const EventArgs& e);	bool handleHeaderSegMove(const EventArgs& e);
	bool handleColumnSizeChange(const EventArgs& e);	bool handleColumnSizeChange(const EventArgs& e);

End of changes. 2 change blocks.
	0 lines changed or deleted	7 lines changed or added