CEGUIAnimationManager.h   CEGUIAnimationManager.h 
skipping to change at line 105 skipping to change at line 105
*/ */
Interpolator* getInterpolator(const String& type) const; Interpolator* getInterpolator(const String& type) const;
/*! /*!
\brief \brief
Creates a new Animation definition Creates a new Animation definition
\see \see
Animation Animation
*/ */
Animation* createAnimation(const String& name); Animation* createAnimation(const String& name = "");
/*! /*!
\brief \brief
Destroys given animation definition Destroys given animation definition
*/ */
void destroyAnimation(Animation* animation); void destroyAnimation(Animation* animation);
/*! /*!
\brief \brief
Destroys given animation definition by name Destroys given animation definition by name
skipping to change at line 230 skipping to change at line 230
\return \return
String describing the default resource group identifier that will b e String describing the default resource group identifier that will b e
used when loading Animation xml data. used when loading Animation xml data.
*/ */
static const String& getDefaultResourceGroup() static const String& getDefaultResourceGroup()
{ {
return s_defaultResourceGroup; return s_defaultResourceGroup;
} }
/*!
\brief
Examines the list of Animations to see if one exists with the given
name
\param name
String holding the name of the Animation to look for.
\return
true if an Animation was found with a name matching \a name. false
if
no matching Animation was found.
*/
bool isAnimationPresent(const String& name) const;
private: private:
String generateUniqueAnimationName();
typedef std::map<String, Interpolator*> InterpolatorMap; typedef std::map<String, Interpolator*> InterpolatorMap;
//! stores available interpolators //! stores available interpolators
InterpolatorMap d_interpolators; InterpolatorMap d_interpolators;
typedef std::vector<Interpolator*> BasicInterpolatorList; typedef std::vector<Interpolator*> BasicInterpolatorList;
//! stores interpolators that are inbuilt in CEGUI //! stores interpolators that are inbuilt in CEGUI
BasicInterpolatorList d_basicInterpolators; BasicInterpolatorList d_basicInterpolators;
typedef std::map<String, Animation*> AnimationMap; typedef std::map<String, Animation*> AnimationMap;
//! all defined animations //! all defined animations
AnimationMap d_animations; AnimationMap d_animations;
typedef std::multimap<Animation*, AnimationInstance*> AnimationInstance Map; typedef std::multimap<Animation*, AnimationInstance*> AnimationInstance Map;
//! all instances of animations //! all instances of animations
AnimationInstanceMap d_animationInstances; AnimationInstanceMap d_animationInstances;
//! Name of the schema used for loading animation xml files. //! Name of the schema used for loading animation xml files.
static const String s_xmlSchemaName; static const String s_xmlSchemaName;
//! Default resource group used when loading animation xml files. //! Default resource group used when loading animation xml files.
static String s_defaultResourceGroup; static String s_defaultResourceGroup;
//! Base name to use for generated window names.
static const String GeneratedAnimationNameBase;
//! Counter used to generate unique animation names.
unsigned long d_uid_counter;
}; };
} // 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 _CEGUIAnimationManager_h_ #endif // end of guard _CEGUIAnimationManager_h_
 End of changes. 4 change blocks. 
1 lines changed or deleted 22 lines changed or added


 CEGUIDataContainer.h   CEGUIDataContainer.h 
/*********************************************************************** /***********************************************************************
filename: CEGUIDataContainer.h filename: CEGUIDataContainer.h
created: 10/8/2004 created: 10/8/2004
author: James '_mental_' O'Sullivan author: James '_mental_' O'Sullivan
purpose: Declares the RawDataContainer purpose: Declares the RawDataContainer
*************************************************************************/ *************************************************************************/
/************************************************************************** * /************************************************************************** *
* Copyright (C) 2004 - 2006 Paul D Turner & The CEGUI Development Team * Copyright (C) 2004 - 2011 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
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 CEGUIDynamicModule.h   CEGUIDynamicModule.h 
skipping to change at line 46 skipping to change at line 46
*************************************************************************/ *************************************************************************/
#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__) || defined(__FreeBSD__) || defined(__NetBSD__) #elif defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__HAIKU__)
# 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( )
#elif defined(__APPLE_CC__) #elif defined(__APPLE_CC__)
# define DYNLIB_HANDLE CFBundleRef # define DYNLIB_HANDLE CFBundleRef
# define DYNLIB_LOAD( a ) mac_loadExeBundle( a ) # define DYNLIB_LOAD( a ) mac_loadExeBundle( a )
# define DYNLIB_GETSYM( a, b ) mac_getBundleSym( a, b ) # define DYNLIB_GETSYM( a, b ) mac_getBundleSym( a, b )
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 CEGUIFalImagerySection.h   CEGUIFalImagerySection.h 
skipping to change at line 241 skipping to change at line 241
Writes an xml representation of this ImagerySection to \a out_s tream. Writes an xml representation of this ImagerySection to \a out_s tream.
\param xml_stream \param xml_stream
Stream where xml data should be output. Stream where xml data should be output.
\return \return
Nothing. Nothing.
*/ */
void writeXMLToStream(XMLSerializer& xml_stream) const; void writeXMLToStream(XMLSerializer& xml_stream) const;
//! return number of TextComponents in the ImagerySection.
size_t getTextComponentCount() const;
//! return a reference to a TextComponent (via index).
const TextComponent& getTextComponent(const size_t idx) const;
protected: protected:
/*! /*!
\brief \brief
Helper method to initialise a ColourRect with appropriate value s according to the way the Helper method to initialise a ColourRect with appropriate value s according to the way the
ImagerySection is set up. ImagerySection is set up.
This will try and get values from multiple places: This will try and get values from multiple places:
- a property attached to \a wnd - a property attached to \a wnd
- or the integral d_masterColours value. - or the integral d_masterColours value.
*/ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 lines changed or added


 CEGUIFalTextComponent.h   CEGUIFalTextComponent.h 
skipping to change at line 237 skipping to change at line 237
the text string of this TextComponent. the text string of this TextComponent.
\param property \param property
String object holding the name of a Propery. The property shou ld access a valid font name. String object holding the name of a Propery. The property shou ld access a valid font name.
\return \return
Nothing. Nothing.
*/ */
void setFontPropertySource(const String& property); void setFontPropertySource(const String& property);
//! return the horizontal pixel extent of the formatted rendered st
ring.
float getHorizontalTextExtent() const;
//! return the vertical pixel extent of the formatted rendered stri
ng.
float getVerticalTextExtent() const;
protected: protected:
// implemets abstract from base // implemets abstract from base
void render_impl(Window& srcWindow, Rect& destRect, const CEGUI::Co lourRect* modColours, const Rect* clipper, bool clipToDisplay) const; void render_impl(Window& srcWindow, Rect& destRect, const CEGUI::Co lourRect* modColours, const Rect* clipper, bool clipToDisplay) const;
//! helper to set up an appropriate FormattedRenderedString //! helper to set up an appropriate FormattedRenderedString
void setupStringFormatter(const Window& window, void setupStringFormatter(const Window& window,
const RenderedString& rendered_string) co nst; const RenderedString& rendered_string) co nst;
private: private:
String d_textLogical; //!< text rendered b y this component. String d_textLogical; //!< text rendered b y this component.
//! pointer to bidirection support object //! pointer to bidirection support object
BiDiVisualMapping* d_bidiVisualMapping; BiDiVisualMapping* d_bidiVisualMapping;
 End of changes. 1 change blocks. 
0 lines changed or deleted 8 lines changed or added


 CEGUIRenderEffectFactory.h   CEGUIRenderEffectFactory.h 
skipping to change at line 28 skipping to change at line 28
* 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 _CEGUIRenderEffectFactory_h #ifndef _CEGUIRenderEffectFactory_h_
#define _CEGUIRenderEffectFactory_h #define _CEGUIRenderEffectFactory_h_
// Start of CEGUI namespace section // Start of CEGUI namespace section
namespace CEGUI namespace CEGUI
{ {
class RenderEffect; class RenderEffect;
/*! /*!
\brief \brief
Interface for factory objects that create RenderEffect instances. Interface for factory objects that create RenderEffect instances.
Currently this interface is intended for internal use only. Currently this interface is intended for internal use only.
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 CEGUIRenderEffectManager.h   CEGUIRenderEffectManager.h 
skipping to change at line 28 skipping to change at line 28
* 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 _CEGUIRenderEffectManager_h #ifndef _CEGUIRenderEffectManager_h_
#define _CEGUIRenderEffectManager_h #define _CEGUIRenderEffectManager_h_
#include "CEGUISingleton.h" #include "CEGUISingleton.h"
#include "CEGUIIteratorBase.h" #include "CEGUIIteratorBase.h"
#include "CEGUILogger.h" #include "CEGUILogger.h"
#include "CEGUIExceptions.h" #include "CEGUIExceptions.h"
#include "CEGUIRenderEffectFactory.h" #include "CEGUIRenderEffectFactory.h"
#include <map> #include <map>
#if defined(_MSC_VER) #if defined(_MSC_VER)
# pragma warning(push) # pragma warning(push)
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 CEGUIString.h   CEGUIString.h 
skipping to change at line 34 skipping to change at line 34
* 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 _CEGUIString_h_ #ifndef _CEGUIString_h_
#define _CEGUIString_h_ #define _CEGUIString_h_
#include "CEGUIBase.h" #include "CEGUIBase.h"
#include <string>
#include <string.h> #include <string.h>
#include <stdexcept> #include <stdexcept>
#include <cstddef>
// Start of CEGUI namespace section // Start of CEGUI namespace section
namespace CEGUI namespace CEGUI
{ {
#define STR_QUICKBUFF_SIZE 32 #define STR_QUICKBUFF_SIZE 32
/******************************************************************* ****** /******************************************************************* ******
Basic Types Basic Types
******************************************************************** *****/ ******************************************************************** *****/
typedef uint8 utf8; typedef uint8 utf8;
//typedef uint16 utf16; // removed typedef to preven t usage, as utf16 is not supported (yet) //typedef uint16 utf16; // removed typedef to preven t usage, as utf16 is not supported (yet)
skipping to change at line 65 skipping to change at line 65
as such. as such.
*/ */
class CEGUIEXPORT String class CEGUIEXPORT String
{ {
public: public:
/******************************************************************* ****** /******************************************************************* ******
Integral Types Integral Types
******************************************************************** *****/ ******************************************************************** *****/
typedef utf32 value_type; //!< Basic 'code point' type used for String (utf32) typedef utf32 value_type; //!< Basic 'code point' type used for String (utf32)
typedef size_t size_type; //!< Unsigned type used for size values and indices typedef size_t size_type; //!< Unsigned type used for size values and indices
typedef ptrdiff_t difference_type; //!< Signed type used for differences typedef std::ptrdiff_t difference_type; //!< Signed type used for differences
typedef utf32& reference; //!< Type used for utf32 code point references typedef utf32& reference; //!< Type used for utf32 code point references
typedef const utf32& const_reference; //!< Type used for constant utf32 code point references typedef const utf32& const_reference; //!< Type used for constant utf32 code point references
typedef utf32* pointer; //!< Type used for utf32 code point pointers typedef utf32* pointer; //!< Type used for utf32 code point pointers
typedef const utf32* const_pointer; //!< Type used for constant utf32 code point pointers typedef const utf32* const_pointer; //!< Type used for constant utf32 code point pointers
static const size_type npos; //!< Value used to represent 'not found' conditions and 'all co de points' etc. static const size_type npos; //!< Value used to represent 'not found' conditions and 'all co de points' etc.
private: private:
/******************************************************************* ****** /******************************************************************* ******
Implementation data Implementation data
 End of changes. 3 change blocks. 
2 lines changed or deleted 2 lines changed or added


 CEGUISystem.h   CEGUISystem.h 
/*********************************************************************** /***********************************************************************
filename: CEGUISystem.h filename: CEGUISystem.h
created: 20/2/2004 created: 20/2/2004
author: Paul D Turner author: Paul D Turner
purpose: Defines interface for main GUI system class purpose: Defines interface for main GUI system class
*************************************************************************/ *************************************************************************/
/************************************************************************** * /************************************************************************** *
* Copyright (C) 2004 - 2009 Paul D Turner & The CEGUI Development Team * Copyright (C) 2004 - 2011 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
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 CEGUIVersion.h   CEGUIVersion.h 
skipping to change at line 42 skipping to change at line 42
*************************************************************************/ *************************************************************************/
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
#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 7 #define CEGUI_VERSION_MINOR 7
#define CEGUI_VERSION_PATCH 5 #define CEGUI_VERSION_PATCH 6
#endif // end of guard _CEGUIVersion_h_ #endif // end of guard _CEGUIVersion_h_
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 CEGUIWindow.h   CEGUIWindow.h 
/*********************************************************************** /***********************************************************************
filename: CEGUIWindow.h filename: CEGUIWindow.h
created: 21/2/2004 created: 21/2/2004
author: Paul D Turner author: Paul D Turner
purpose: Defines abstract base class for Window objects purpose: Defines abstract base class for Window objects
*************************************************************************/ *************************************************************************/
/************************************************************************** * /************************************************************************** *
* Copyright (C) 2004 - 2006 Paul D Turner & The CEGUI Development Team * Copyright (C) 2004 - 2011 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
skipping to change at line 2156 skipping to change at line 2156
\brief \brief
Set the mouse cursor image to be used when the mouse enters this wi ndow. Set the mouse cursor image to be used when the mouse enters this wi ndow.
\param image \param image
Pointer to the Image object to use as the mouse cursor image when t he Pointer to the Image object to use as the mouse cursor image when t he
mouse enters the area for this Window. mouse enters the area for this Window.
\return \return
Nothing. Nothing.
*/ */
void setMouseCursor(const Image* image) {d_mouseCursor = image;} void setMouseCursor(const Image* image);
/*! /*!
\brief \brief
Set the mouse cursor image to be used when the mouse enters this wi ndow. Set the mouse cursor image to be used when the mouse enters this wi ndow.
\param image \param image
One of the MouseCursorImage enumerated values. One of the MouseCursorImage enumerated values.
\return \return
Nothing. Nothing.
*/ */
void setMouseCursor(MouseCursorImage image) void setMouseCursor(MouseCursorImage image);
{d_mouseCursor = (const Image*)image;}
/*! /*!
\brief \brief
Set the mouse cursor image to be used when the mouse enters this wi ndow. Set the mouse cursor image to be used when the mouse enters this wi ndow.
\param imageset \param imageset
String object that contains the name of the Imageset that contains the String object that contains the name of the Imageset that contains the
image to be used. image to be used.
\param image_name \param image_name
skipping to change at line 3255 skipping to change at line 3254
\return \return
the cloned Window the cloned Window
*/ */
Window* clone(const String& newName, const bool deepCopy = true) const; Window* clone(const String& newName, const bool deepCopy = true) const;
//! copies this widget's properties to given target widget //! copies this widget's properties to given target widget
virtual void clonePropertiesTo(Window& target) const; virtual void clonePropertiesTo(Window& target) const;
//! copies this widget's child widgets to given target widget //! copies this widget's child widgets to given target widget
virtual void cloneChildWidgetsTo(Window& target) const; virtual void cloneChildWidgetsTo(Window& target) const;
/*!
\brief
Return the (visual) z index of the window on it's parent.
The z index is a number that indicates the order that windows will
be
drawn (but is not a 'z co-ordinate', as such). Higher numbers are
in
front of lower numbers.
The number returned will not be stable, and generally should be use
d to
compare with the z index of sibling windows (and only sibling windo
ws)
to discover the current z ordering of those windows.
*/
size_t getZIndex() const;
/*!
\brief
Return whether /a this Window is in front of the given window.
\note
Here 'in front' just means that one window is drawn after the other
, it
is not meant to imply that the windows are overlapping nor that one
window is obscured by the other.
*/
bool isInFront(const Window& wnd) const;
/*!
\brief
Return whether /a this Window is behind the given window.
\note
Here 'behind' just means that one window is drawn before the other,
it
is not meant to imply that the windows are overlapping nor that one
window is obscured by the other.
*/
bool isBehind(const Window& wnd) const;
protected: protected:
// friend classes for construction / initialisation purposes (for now) // friend classes for construction / initialisation purposes (for now)
friend class System; friend class System;
friend class WindowManager; friend class WindowManager;
/********************************************************************** *** /********************************************************************** ***
Event trigger methods Event trigger methods
*********************************************************************** **/ *********************************************************************** **/
/*! /*!
\brief \brief
skipping to change at line 4090 skipping to change at line 4125
//! helper function for calculating clipping rectangles. //! helper function for calculating clipping rectangles.
Rect getParentElementClipIntersection(const Rect& unclipped_area) const ; Rect getParentElementClipIntersection(const Rect& unclipped_area) const ;
//! helper function to invalidate window and optionally child windows. //! helper function to invalidate window and optionally child windows.
void invalidate_impl(const bool recursive); void invalidate_impl(const bool recursive);
//! helper to return whether the inner rect size has changed //! helper to return whether the inner rect size has changed
bool isInnerRectSizeChanged() const; bool isInnerRectSizeChanged() const;
/*!
\brief
Helper function to return the ancestor Window of /a wnd that is att
ached
as a child to a window that is also an ancestor of /a this. Return
s 0
if /a wnd and /a this are not part of the same hierachy.
*/
const Window* getWindowAttachedToCommonAncestor(const Window& wnd) cons
t;
//! Default implementation of function to return Window outer rect area . //! Default implementation of function to return Window outer rect area .
virtual Rect getUnclippedOuterRect_impl() const; virtual Rect getUnclippedOuterRect_impl() const;
//! Default implementation of function to return Window outer clipper a rea. //! Default implementation of function to return Window outer clipper a rea.
virtual Rect getOuterRectClipper_impl() const; virtual Rect getOuterRectClipper_impl() const;
//! Default implementation of function to return Window inner clipper a rea. //! Default implementation of function to return Window inner clipper a rea.
virtual Rect getInnerRectClipper_impl() const; virtual Rect getInnerRectClipper_impl() const;
//! Default implementation of function to return Window hit-test area. //! Default implementation of function to return Window hit-test area.
virtual Rect getHitTestRect_impl() const; virtual Rect getHitTestRect_impl() const;
//! Default implementation of function to return non-client content are a //! Default implementation of function to return non-client content are a
virtual Rect getNonClientChildWindowContentArea_impl() const; virtual Rect getNonClientChildWindowContentArea_impl() const;
 End of changes. 5 change blocks. 
4 lines changed or deleted 56 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/