CEGUI.h   CEGUI.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 _CEGUI_h_ #ifndef _CEGUI_h_
#define _CEGUI_h_ #define _CEGUI_h_
// base stuff // base stuff
#include "CEGUIAffector.h"
#include "CEGUIAnimation.h"
#include "CEGUIAnimationInstance.h"
#include "CEGUIAnimationManager.h"
#include "CEGUIBasicInterpolators.h"
#include "CEGUIBasicRenderedStringParser.h" #include "CEGUIBasicRenderedStringParser.h"
#include "CEGUIBiDiVisualMapping.h" #include "CEGUIBiDiVisualMapping.h"
#include "CEGUICentredRenderedString.h" #include "CEGUICentredRenderedString.h"
#include "CEGUIcolour.h" #include "CEGUIcolour.h"
#include "CEGUIColourRect.h" #include "CEGUIColourRect.h"
#include "CEGUICoordConverter.h" #include "CEGUICoordConverter.h"
#include "CEGUIDataContainer.h" #include "CEGUIDataContainer.h"
#include "CEGUIDefaultLogger.h" #include "CEGUIDefaultLogger.h"
#include "CEGUIDefaultRenderedStringParser.h" #include "CEGUIDefaultRenderedStringParser.h"
#include "CEGUIDefaultResourceProvider.h" #include "CEGUIDefaultResourceProvider.h"
#include "CEGUIDynamicModule.h" #include "CEGUIDynamicModule.h"
#include "CEGUIExceptions.h" #include "CEGUIExceptions.h"
#include "CEGUIFactoryModule.h" #include "CEGUIFactoryModule.h"
#include "CEGUIFontManager.h" #include "CEGUIFontManager.h"
#include "CEGUIGeometryBuffer.h" #include "CEGUIGeometryBuffer.h"
#include "CEGUIGlobalEventSet.h" #include "CEGUIGlobalEventSet.h"
#include "CEGUIImageCodec.h" #include "CEGUIImageCodec.h"
#include "CEGUIImagesetManager.h" #include "CEGUIImagesetManager.h"
#include "CEGUIInputEvent.h" #include "CEGUIInputEvent.h"
#include "CEGUIInterpolator.h"
#include "CEGUIJustifiedRenderedString.h" #include "CEGUIJustifiedRenderedString.h"
#include "CEGUIKeyFrame.h"
#include "CEGUILeftAlignedRenderedString.h" #include "CEGUILeftAlignedRenderedString.h"
#include "CEGUIMouseCursor.h" #include "CEGUIMouseCursor.h"
#include "CEGUIPropertyHelper.h" #include "CEGUIPropertyHelper.h"
#include "CEGUIPropertySet.h" #include "CEGUIPropertySet.h"
#include "CEGUIRect.h" #include "CEGUIRect.h"
#include "CEGUIRegexMatcher.h" #include "CEGUIRegexMatcher.h"
#include "CEGUIRenderedString.h" #include "CEGUIRenderedString.h"
#include "CEGUIRenderedStringImageComponent.h" #include "CEGUIRenderedStringImageComponent.h"
#include "CEGUIRenderedStringParser.h" #include "CEGUIRenderedStringParser.h"
#include "CEGUIRenderedStringTextComponent.h" #include "CEGUIRenderedStringTextComponent.h"
#include "CEGUIRenderedStringWidgetComponent.h" #include "CEGUIRenderedStringWidgetComponent.h"
#include "CEGUIRenderedStringWordWrapper.h" #include "CEGUIRenderedStringWordWrapper.h"
#include "CEGUIRenderEffect.h" #include "CEGUIRenderEffect.h"
#include "CEGUIRenderEffectManager.h"
#include "CEGUIRenderer.h" #include "CEGUIRenderer.h"
#include "CEGUIRenderingContext.h" #include "CEGUIRenderingContext.h"
#include "CEGUIRenderingRoot.h" #include "CEGUIRenderingRoot.h"
#include "CEGUIRenderingSurface.h" #include "CEGUIRenderingSurface.h"
#include "CEGUIRenderingWindow.h" #include "CEGUIRenderingWindow.h"
#include "CEGUIRenderQueue.h" #include "CEGUIRenderQueue.h"
#include "CEGUIRenderTarget.h" #include "CEGUIRenderTarget.h"
#include "CEGUIRightAlignedRenderedString.h" #include "CEGUIRightAlignedRenderedString.h"
#include "CEGUISchemeManager.h" #include "CEGUISchemeManager.h"
#include "CEGUIScriptModule.h" #include "CEGUIScriptModule.h"
 End of changes. 4 change blocks. 
0 lines changed or deleted 8 lines changed or added


 CEGUIAll.h   CEGUIAll.h 
skipping to change at line 38 skipping to change at line 38
#ifndef _CEGUIAll_h_ #ifndef _CEGUIAll_h_
#define _CEGUIAll_h_ #define _CEGUIAll_h_
#include "CEGUICheckbox.h" #include "CEGUICheckbox.h"
#include "CEGUIClippedContainer.h" #include "CEGUIClippedContainer.h"
#include "CEGUICombobox.h" #include "CEGUICombobox.h"
#include "CEGUIComboDropList.h" #include "CEGUIComboDropList.h"
#include "CEGUIDragContainer.h" #include "CEGUIDragContainer.h"
#include "CEGUIEditbox.h" #include "CEGUIEditbox.h"
#include "CEGUIFrameWindow.h" #include "CEGUIFrameWindow.h"
#include "CEGUIGridLayoutContainer.h"
#include "CEGUIGroupBox.h" #include "CEGUIGroupBox.h"
#include "CEGUIGUISheet.h" #include "CEGUIGUISheet.h"
#include "CEGUIHorizontalLayoutContainer.h"
#include "CEGUIItemEntry.h" #include "CEGUIItemEntry.h"
#include "CEGUIItemListbox.h" #include "CEGUIItemListbox.h"
#include "CEGUIListbox.h" #include "CEGUIListbox.h"
#include "CEGUIListboxItem.h" #include "CEGUIListboxItem.h"
#include "CEGUIListboxTextItem.h" #include "CEGUIListboxTextItem.h"
#include "CEGUIListHeader.h" #include "CEGUIListHeader.h"
#include "CEGUIMenubar.h" #include "CEGUIMenubar.h"
#include "CEGUIMenuItem.h" #include "CEGUIMenuItem.h"
#include "CEGUIMultiColumnList.h" #include "CEGUIMultiColumnList.h"
#include "CEGUIMultiLineEditbox.h" #include "CEGUIMultiLineEditbox.h"
skipping to change at line 66 skipping to change at line 68
#include "CEGUIScrolledContainer.h" #include "CEGUIScrolledContainer.h"
#include "CEGUISlider.h" #include "CEGUISlider.h"
#include "CEGUISpinner.h" #include "CEGUISpinner.h"
#include "CEGUITabButton.h" #include "CEGUITabButton.h"
#include "CEGUITabControl.h" #include "CEGUITabControl.h"
#include "CEGUIThumb.h" #include "CEGUIThumb.h"
#include "CEGUITitlebar.h" #include "CEGUITitlebar.h"
#include "CEGUITooltip.h" #include "CEGUITooltip.h"
#include "CEGUITree.h" #include "CEGUITree.h"
#include "CEGUITreeItem.h" #include "CEGUITreeItem.h"
#include "CEGUIVerticalLayoutContainer.h"
#endif // End of guard _CEGUIAll_h_ #endif // End of guard _CEGUIAll_h_
 End of changes. 3 change blocks. 
0 lines changed or deleted 3 lines changed or added


 CEGUIBase.h   CEGUIBase.h 
skipping to change at line 104 skipping to change at line 104
// The following defines macros used within CEGUI for std::min/std::max // The following defines macros used within CEGUI for std::min/std::max
// usage, and is done as a compatibility measure for VC6 with native STL. // usage, and is done as a compatibility measure for VC6 with native STL.
#if defined(_MSC_VER) && (_MSC_VER <= 1200) && !defined(_STLPORT_VERSION) #if defined(_MSC_VER) && (_MSC_VER <= 1200) && !defined(_STLPORT_VERSION)
# define ceguimin std::_cpp_min # define ceguimin std::_cpp_min
# define ceguimax std::_cpp_max # define ceguimax std::_cpp_max
#else #else
# define ceguimin std::min # define ceguimin std::min
# define ceguimax std::max # define ceguimax std::max
#endif #endif
// CEGUI's Exception macros
// This provides a mechanism to override how exception handling is used. N
ote
// that in general this facility _should not be used_. Attempts to use thi
s
// to disable exceptions to 'make things easier' are doomed to failure. CE
GUI
// becomes less robust without exceptions (because they are used internally
by
// CEGUI). In addition, overriding the exception mechanism will also cause
// memory leaks in various places. This is your only warning about such th
ings,
// if you decide to continue anyway you hereby waive any right to complain
:-p
#ifndef CEGUI_TRY
# define CEGUI_TRY try
#endif
#ifndef CEGUI_CATCH
# define CEGUI_CATCH(e) catch (e)
#endif
#ifndef CEGUI_THROW
# define CEGUI_THROW(e) throw e
#endif
#ifndef CEGUI_RETHROW
# define CEGUI_RETHROW throw
#endif
/************************************************************************* /*************************************************************************
Documentation for the CEGUI namespace itself Documentation for the CEGUI namespace itself
*************************************************************************/ *************************************************************************/
/*! /*!
\brief \brief
Main namespace for Crazy Eddie's GUI Library Main namespace for Crazy Eddie's GUI Library
The CEGUI namespace contains all the classes and other items that co mprise the core The CEGUI namespace contains all the classes and other items that co mprise the core
of Crazy Eddie's GUI system. of Crazy Eddie's GUI system.
*/ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 27 lines changed or added


 CEGUICheckbox.h   CEGUICheckbox.h 
skipping to change at line 59 skipping to change at line 59
*/ */
class CEGUIEXPORT Checkbox : public ButtonBase class CEGUIEXPORT Checkbox : public ButtonBase
{ {
public: public:
static const String EventNamespace; //!< Namespace for global events static const String EventNamespace; //!< Namespace for global events
static const String WidgetTypeName; //!< Window factory nam e static const String WidgetTypeName; //!< Window factory nam e
/******************************************************************* ****** /******************************************************************* ******
Event name constants Event name constants
******************************************************************** *****/ ******************************************************************** *****/
// generated internally by Window /** Event fired when then checked state of the Checkbox changes.
static const String EventCheckStateChanged; //!< * Handlers are passed a const WindowEventArgs reference with
The check-state of the widget has changed. * WindowEventArgs::window set to the Checkbox whose state has changed.
*/
static const String EventCheckStateChanged;
/******************************************************************* ****** /******************************************************************* ******
Accessor Functions Accessor Functions
******************************************************************** *****/ ******************************************************************** *****/
/*! /*!
\brief \brief
return true if the check-box is selected (has the checkmark) return true if the check-box is selected (has the checkmark)
\return \return
true if the widget is selected and has the check-mark, false if the widget true if the widget is selected and has the check-mark, false if the widget
 End of changes. 1 change blocks. 
3 lines changed or deleted 5 lines changed or added


 CEGUIColourRect.h   CEGUIColourRect.h 
skipping to change at line 190 skipping to change at line 190
The constant factor to modulate all alpha colour components by. The constant factor to modulate all alpha colour components by.
*/ */
void modulateAlpha(float alpha); void modulateAlpha(float alpha);
/*! /*!
\brief \brief
Modulate all components of this colour rect with corresponding comp onents from another colour rect. Modulate all components of this colour rect with corresponding comp onents from another colour rect.
*/ */
ColourRect& operator*=(const ColourRect& other); ColourRect& operator*=(const ColourRect& other);
inline ColourRect operator*(const float val) const
{
return ColourRect(
d_top_left * val,
d_top_right * val,
d_bottom_left * val,
d_bottom_right * val
);
}
inline ColourRect operator+(const ColourRect& val) const
{
return ColourRect(
d_top_left + val.d_top_left,
d_top_right + val.d_top_right,
d_bottom_left + val.d_bottom_left,
d_bottom_right + val.d_bottom_right
);
}
colour d_top_left, d_top_right, d_bottom_left, d_bottom_right; //<! ColourRect component colours colour d_top_left, d_top_right, d_bottom_left, d_bottom_right; //<! ColourRect component colours
}; };
} // End of CEGUI namespace section } // End of CEGUI namespace section
#endif // end of guard _CEGUIColourRect_h_ #endif // end of guard _CEGUIColourRect_h_
 End of changes. 1 change blocks. 
0 lines changed or deleted 20 lines changed or added


 CEGUIComboDropList.h   CEGUIComboDropList.h 
skipping to change at line 57 skipping to change at line 57
class CEGUIEXPORT ComboDropList : public Listbox class CEGUIEXPORT ComboDropList : public Listbox
{ {
public: public:
static const String EventNamespace; //!< Namespace for global events static const String EventNamespace; //!< Namespace for global events
static const String WidgetTypeName; //!< Window factory nam e static const String WidgetTypeName; //!< Window factory nam e
/******************************************************************* ****** /******************************************************************* ******
Constants Constants
******************************************************************** *****/ ******************************************************************** *****/
// Event names // Event names
static const String EventListSelectionAccepted; //!< Event f /** Event fired when the user confirms the selection by clicking the mo
ired when the user confirms the selection by clicking the mouse. use.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ComboDropList whose selection has
been
* confirmed by the user.
*/
static const String EventListSelectionAccepted;
/*! /*!
\brief \brief
Initialise the Window based object ready for use. Initialise the Window based object ready for use.
\note \note
This must be called for every window created. Normally this is handled automatically by the WindowFactory for each Window type. This must be called for every window created. Normally this is handled automatically by the WindowFactory for each Window type.
\return \return
Nothing Nothing
 End of changes. 1 change blocks. 
2 lines changed or deleted 8 lines changed or added


 CEGUICombobox.h   CEGUICombobox.h 
skipping to change at line 60 skipping to change at line 60
class CEGUIEXPORT Combobox : public Window class CEGUIEXPORT Combobox : public Window
{ {
public: public:
static const String EventNamespace; //!< Namespace for global events static const String EventNamespace; //!< Namespace for global events
static const String WidgetTypeName; //!< Window factory nam e static const String WidgetTypeName; //!< Window factory nam e
/******************************************************************* ****** /******************************************************************* ******
Constants Constants
******************************************************************** *****/ ******************************************************************** *****/
// event names from edit box // event names from edit box
static const String EventReadOnlyModeChanged; //!< /** Event fired when the read-only mode for the edit box is changed.
The read-only mode for the edit box has been changed. * Handlers are passed a const WindowEventArgs reference with
static const String EventValidationStringChanged; //!< * WindowEventArgs::window set to the Combobox whose read only mode
The validation string has been changed. * has been changed.
static const String EventMaximumTextLengthChanged; //!< The max */
imum allowable string length has been changed. static const String EventReadOnlyModeChanged;
static const String EventTextInvalidated; /** Event fired when the edix box validation string is changed.
//!< Some operation has made the current text invalid with regards to t * Handlers are passed a const WindowEventArgs reference with
he validation string. * WindowEventArgs::window set to the Combobox whose validation
static const String EventInvalidEntryAttempted; //!< The use * string was changed.
r attempted to modify the text in a way that would have made it invalid. */
static const String EventCaratMoved; static const String EventValidationStringChanged;
//!< The text carat (insert point) has changed. /** Event fired when the maximum string length is changed.
static const String EventTextSelectionChanged; //!< The cur * Handlers are passed a const WindowEventArgs reference with
rent text selection has changed. * WindowEventArgs::window set to the Combobox whose maximum edit box
static const String EventEditboxFull; * string length has been changed.
//!< The number of characters in the edit box has reached the current m */
aximum. static const String EventMaximumTextLengthChanged;
static const String EventTextAccepted; //!< /** Event fired when an operation has made the current edit box text in
The user has accepted the current text by pressing Return, Enter, or Tab. valid
* as regards to the current validation string.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Combobox whose edit box text has
* become invalid.
*/
static const String EventTextInvalidated;
/** Event fired when the user attempts to modify the edit box text in a
way
* that would make it invalid.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Combobox in which the user's inpu
t
* would have invalidated the text.
*/
static const String EventInvalidEntryAttempted;
/** Event fired when the edit box text insertion position is changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Combobox whose caret position has
* been changed.
*/
static const String EventCaratMoved;
/** Event fired when the current edit box text selection is changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Combobox whose edit box text sele
ction
* has been changed.
*/
static const String EventTextSelectionChanged;
/** Event fired when the number of characters in the edit box has reach
ed
* the currently set maximum.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Combobox whose edit box has becom
e
* full.
*/
static const String EventEditboxFull;
/** Event fired when the user accepts the current edit box text by pres
sing
* Return, Enter, or Tab.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Combobox whose edit box text has
been
* accepted / confirmed by the user.
*/
static const String EventTextAccepted;
// event names from list box // event names from list box
static const String EventListContentsChanged; //!< /** Event fired when the contents of the list is changed.
Event triggered when the contents of the list is changed. * Handlers are passed a const WindowEventArgs reference with
static const String EventListSelectionChanged; //!< Event t * WindowEventArgs::window set to the Combobox whose list content has
riggered when there is a change to the currently selected item(s). * changed.
static const String EventSortModeChanged; */
//!< Event triggered when the sort mode setting changes. static const String EventListContentsChanged;
static const String EventVertScrollbarModeChanged; //!< Event t /** Event fired when there is a change to the currently selected item i
riggered when the vertical scroll bar 'force' setting changes. n the
static const String EventHorzScrollbarModeChanged; //!< Event t * list.
riggered when the horizontal scroll bar 'force' setting changes. * Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Combobox whose currently selected
list
* item has changed.
*/
static const String EventListSelectionChanged;
/** Event fired when the sort mode setting of the list is changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Combobox whose list sorting mode
has
* been changed.
*/
static const String EventSortModeChanged;
/** Event fired when the vertical scroll bar 'force' setting for the li
st is
* changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Combobox whose vertical scroll ba
r
* setting is changed.
*/
static const String EventVertScrollbarModeChanged;
/** Event fired when the horizontal scroll bar 'force' setting for the
list
* is changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Combobox whose horizontal scroll
bar
* setting has been changed.
*/
static const String EventHorzScrollbarModeChanged;
// events we produce / generate ourselves // events we produce / generate ourselves
static const String EventDropListDisplayed; //!< /** Event fired when the drop-down list is displayed
Event triggered when the drop-down list is displayed * Handlers are passed a const WindowEventArgs reference with
static const String EventDropListRemoved; * WindowEventArgs::window set to the Combobox whose drop down list has
//!< Event triggered when the drop-down list is removed / hidden. * been displayed.
static const String EventListSelectionAccepted; //!< Event t */
riggered when the user accepts a selection from the drop-down list static const String EventDropListDisplayed;
/** Event fired when the drop-down list is removed / hidden.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Combobox whose drop down list has
* been hidden.
*/
static const String EventDropListRemoved;
/** Event fired when the user accepts a selection from the drop-down li
st
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Combobox in which the user has
* confirmed a selection from the drop down list.
*/
static const String EventListSelectionAccepted;
/********************************************************************** *** /********************************************************************** ***
Child Widget name suffix constants Child Widget name suffix constants
*********************************************************************** **/ *********************************************************************** **/
static const String EditboxNameSuffix; //!< Widget name suffix for the editbox component. static const String EditboxNameSuffix; //!< Widget name suffix for the editbox component.
static const String DropListNameSuffix; //!< Widget name suffix for t he drop list component. static const String DropListNameSuffix; //!< Widget name suffix for t he drop list component.
static const String ButtonNameSuffix; //!< Widget name suffix for the button component. static const String ButtonNameSuffix; //!< Widget name suffix for the button component.
// override from Window class // override from Window class
bool isHit(const Vector2& position, bool isHit(const Vector2& position,
 End of changes. 3 change blocks. 
36 lines changed or deleted 125 lines changed or added


 CEGUIConfig.h   CEGUIConfig.h 
skipping to change at line 144 skipping to change at line 144
// provide the bidirectional support (not supplied). // provide the bidirectional support (not supplied).
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
//#define CEGUI_BIDI_SUPPORT //#define CEGUI_BIDI_SUPPORT
// Uncomment this to use the embedded minibidi library. // Uncomment this to use the embedded minibidi library.
//#define CEGUI_USE_MINIBIDI //#define CEGUI_USE_MINIBIDI
// - or - // - or -
// Uncomment this to use an external fribidi library. // Uncomment this to use an external fribidi library.
//#define CEGUI_USE_FRIBIDI //#define CEGUI_USE_FRIBIDI
//////////////////////////////////////////////////////////////////////////
// The following controls whether the MinizipResourceProvider will be
// built into the CEGUIBase library. You can uncomment the following line
// to include this code (and it's dependency code).
//
// The MinizipResourceProvider provides the ability to load resource files
// from locations within .zip files.
//////////////////////////////////////////////////////////////////////////
//#define CEGUI_HAS_MINIZIP_RESOURCE_PROVIDER
#endif // defined(__APPLE__) #endif // defined(__APPLE__)
#endif // end of guard _CEGUIConfig_h_ #endif // end of guard _CEGUIConfig_h_
 End of changes. 1 change blocks. 
0 lines changed or deleted 10 lines changed or added


 CEGUIDragContainer.h   CEGUIDragContainer.h 
skipping to change at line 55 skipping to change at line 55
Generic drag & drop enabled window class Generic drag & drop enabled window class
*/ */
class CEGUIEXPORT DragContainer : public Window class CEGUIEXPORT DragContainer : public Window
{ {
public: public:
/****************************************************************** ******* /****************************************************************** *******
Constants Constants
******************************************************************* ******/ ******************************************************************* ******/
static const String WidgetTypeName; //!< Type name for DragCont ainer. static const String WidgetTypeName; //!< Type name for DragCont ainer.
static const String EventNamespace; //!< Namespace for global e vents static const String EventNamespace; //!< Namespace for global e vents
static const String EventDragStarted; //!< Name of the event fire /** Event fired when the user begins dragging the DragContainer.
d when the user begins dragging the thumb. * Handlers are passed a const WindowEventArgs reference with
static const String EventDragEnded; //!< Name of the event fire * WindowEventArgs::window set to the DragContainer that the user
d when the user releases the thumb. * has started to drag.
static const String EventDragPositionChanged; //!< Event fired wh */
en the drag position has changed. static const String EventDragStarted;
static const String EventDragEnabledChanged; //!< Event fired wh /** Event fired when the user releases the DragContainer.
en dragging is enabled or disabled. * Handlers are passed a const WindowEventArgs reference with
static const String EventDragAlphaChanged; //!< Event fired wh * WindowEventArgs::window set to the DragContainer that the user h
en the alpha value used when dragging is changed. as
static const String EventDragMouseCursorChanged;//!< Event fired wh * released.
en the mouse cursor used when dragging is changed. */
static const String EventDragThresholdChanged; //!< Event fired wh static const String EventDragEnded;
en the drag pixel threshold is changed. /** Event fired when the drag position has changed.
static const String EventDragDropTargetChanged; //!< Event fired wh * Handlers are passed a const WindowEventArgs reference with
en the drop target changes. * WindowEventArgs::window set to the DragContainer whose position
has
* changed due to the user dragging it.
*/
static const String EventDragPositionChanged;
/** Event fired when dragging is enabled or disabled.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the DragContainer whose setting h
as
* been changed.
*/
static const String EventDragEnabledChanged;
/** Event fired when the alpha value used when dragging is changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the DragContainer whose drag alph
a
* value has been changed.
*/
static const String EventDragAlphaChanged;
/** Event fired when the mouse cursor to used when dragging is chan
ged.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the DragContainer whose dragging
* mouse cursor image has been changed.
*/
static const String EventDragMouseCursorChanged;
/** Event fired when the drag pixel threshold is changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the DragContainer whose dragging
pixel
* threshold has been changed.
*/
static const String EventDragThresholdChanged;
/** Event fired when the drop target changes.
* Handlers are passed a const DragDropEventArgs reference with
* WindowEventArgs::window set to the Window that is now the target
* window and DragDropEventArgs::dragDropItem set to the DragConta
iner
* whose target has changed.
*/
static const String EventDragDropTargetChanged;
/****************************************************************** ******* /****************************************************************** *******
Object Construction and Destruction Object Construction and Destruction
******************************************************************* ******/ ******************************************************************* ******/
/*! /*!
\brief \brief
Constructor for DragContainer objects Constructor for DragContainer objects
*/ */
DragContainer(const String& type, const String& name); DragContainer(const String& type, const String& name);
 End of changes. 1 change blocks. 
16 lines changed or deleted 56 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__) #elif defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
# 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


 CEGUIEditbox.h   CEGUIEditbox.h 
skipping to change at line 77 skipping to change at line 77
//------------------------------------------------------------------------- ---// //------------------------------------------------------------------------- ---//
//! Base class for an Editbox widget //! Base class for an Editbox widget
class CEGUIEXPORT Editbox : public Window class CEGUIEXPORT Editbox : public Window
{ {
public: public:
//! Namespace for global events //! Namespace for global events
static const String EventNamespace; static const String EventNamespace;
//! Window factory name //! Window factory name
static const String WidgetTypeName; static const String WidgetTypeName;
//! The read-only mode for the edit box has been changed. /** Event fired when the read-only mode for the edit box is changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Editbox whose read only setting
* has been changed.
*/
static const String EventReadOnlyModeChanged; static const String EventReadOnlyModeChanged;
//! The masked rendering mode (password mode) has been changed. /** Event fired when the masked rendering mode (password mode) is chang
ed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Editbox that has been put into or
* taken out of masked text (password) mode.
*/
static const String EventMaskedRenderingModeChanged; static const String EventMaskedRenderingModeChanged;
//! The code point (character) to use for masked text has been changed. /** Event fired whrn the code point (character) used for masked text is
* changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Editbox whose text masking codepo
int
* has been changed.
*/
static const String EventMaskCodePointChanged; static const String EventMaskCodePointChanged;
//! The validation string has been changed. /** Event fired when the validation string is changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Editbox whose validation string h
as
* been changed.
*/
static const String EventValidationStringChanged; static const String EventValidationStringChanged;
//! The maximum allowable string length has been changed. /** Event fired when the maximum allowable string length is changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Editbox whose maximum string leng
th
* has been changed.
*/
static const String EventMaximumTextLengthChanged; static const String EventMaximumTextLengthChanged;
//! The current text has become invalid as regards to the validation st /** Event fired when the current text has become invalid as regards to
ring. the
* validation string.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Editbox whose text has become inv
alid.
*/
static const String EventTextInvalidated; static const String EventTextInvalidated;
//! The user attempted to chage the text in a way that was invalid. /** Event fired when the user attempts to chage the text in a way that
would
* make it invalid as regards to the validation string.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Editbox in which the users input
would
* have invalidated the text.
*/
static const String EventInvalidEntryAttempted; static const String EventInvalidEntryAttempted;
//! The text carat (insert point) has changed. /** Event fired when the text caret position / insertion point is chang
ed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Editbox whose current insertion p
oint
* has changed.
*/
static const String EventCaratMoved; static const String EventCaratMoved;
//! The current text selection has changed. /** Event fired when the current text selection is changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Editbox whose current text select
ion
* was changed.
*/
static const String EventTextSelectionChanged; static const String EventTextSelectionChanged;
//! The number of characters in the edit box reached the current maximu /** Event fired when the number of characters in the edit box reaches t
m. he
* currently set maximum.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Editbox that has become full.
*/
static const String EventEditboxFull; static const String EventEditboxFull;
//! The user accepted the current text by pressing Return, Enter, or Ta /** Event fired when the user accepts the current text by pressing Retu
b. rn,
* Enter, or Tab.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Editbox in which the user has acc
epted
* the current text.
*/
static const String EventTextAccepted; static const String EventTextAccepted;
/*! /*!
\brief \brief
return true if the Editbox has input focus. return true if the Editbox has input focus.
\return \return
- true if the Editbox has keyboard input focus. - true if the Editbox has keyboard input focus.
- false if the Editbox does not have keyboard input focus. - false if the Editbox does not have keyboard input focus.
*/ */
 End of changes. 11 change blocks. 
14 lines changed or deleted 72 lines changed or added


 CEGUIFalPropertyDefinition.h   CEGUIFalPropertyDefinition.h 
skipping to change at line 43 skipping to change at line 43
// Start of CEGUI namespace section // Start of CEGUI namespace section
namespace CEGUI namespace CEGUI
{ {
/*! /*!
\brief \brief
Class representing a generic get/set property. Class representing a generic get/set property.
*/ */
class CEGUIEXPORT PropertyDefinition : public PropertyDefinitionBase class CEGUIEXPORT PropertyDefinition : public PropertyDefinitionBase
{ {
public: public:
/*!
\deprecated
This version of the constructor is deprecated in favour of the
version taking a help string.
*/
PropertyDefinition(const String& name, const String& initialValue, bool redrawOnWrite, bool layoutOnWrite); PropertyDefinition(const String& name, const String& initialValue, bool redrawOnWrite, bool layoutOnWrite);
//! Constructor.
PropertyDefinition(const String& name, const String& initialValue,
const String& help, bool redrawOnWrite,
bool layoutOnWrite);
// abstract members from Property // abstract members from Property
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);
protected: protected:
void writeXMLElementType(XMLSerializer& xml_stream) const; void writeXMLElementType(XMLSerializer& xml_stream) const;
String d_userStringName; String d_userStringName;
}; };
 End of changes. 2 change blocks. 
0 lines changed or deleted 10 lines changed or added


 CEGUIFalPropertyLinkDefinition.h   CEGUIFalPropertyLinkDefinition.h 
/*********************************************************************** /***********************************************************************
filename: CEGUIFalPropertyLinkDefinition.h filename: CEGUIFalPropertyLinkDefinition.h
created: Sat Oct 8 2005 created: Sat Oct 8 2005
author: Paul D Turner <paul@cegui.org.uk> author: Paul D Turner <paul@cegui.org.uk>
*************************************************************************/ *************************************************************************/
/************************************************************************** * /************************************************************************** *
* Copyright (C) 2004 - 2006 Paul D Turner & The CEGUI Development Team * Copyright (C) 2004 - 2010 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 32 skipping to change at line 32
* 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 _CEGUIFalPropertyLinkDefinition_h_ #ifndef _CEGUIFalPropertyLinkDefinition_h_
#define _CEGUIFalPropertyLinkDefinition_h_ #define _CEGUIFalPropertyLinkDefinition_h_
#include "CEGUIFalPropertyDefinitionBase.h" #include "CEGUIFalPropertyDefinitionBase.h"
#include <vector>
#if defined (_MSC_VER)
# pragma warning(push)
# pragma warning(disable : 4251)
#endif
// Start of CEGUI namespace section // Start of CEGUI namespace section
namespace CEGUI namespace CEGUI
{ {
/*! /*!
\brief \brief
Class representing a property that links to another property define d on Class representing a property that links to another property define d on
an attached child widget. an attached child widget.
*/ */
class CEGUIEXPORT PropertyLinkDefinition : public PropertyDefinitionBas e class CEGUIEXPORT PropertyLinkDefinition : public PropertyDefinitionBas e
{ {
public: public:
PropertyLinkDefinition(const String& propertyName, const String& wi dgetNameSuffix, const String& targetProperty, const String& initialValue, b ool redrawOnWrite, bool layoutOnWrite); PropertyLinkDefinition(const String& propertyName, const String& wi dgetNameSuffix, const String& targetProperty, const String& initialValue, b ool redrawOnWrite, bool layoutOnWrite);
//! add a new link target to \a property on \a widget (name suffix)
.
void addLinkTarget(const String& widget, const String& property);
//! clear all link targets from this link definition.
void clearLinkTargets();
// override members from PropertyDefinitionBase // override members from PropertyDefinitionBase
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);
protected: protected:
void writeXMLElementType(XMLSerializer& xml_stream) const; void writeXMLElementType(XMLSerializer& xml_stream) const;
void writeXMLAttributes(XMLSerializer& xml_stream) const; void writeXMLAttributes(XMLSerializer& xml_stream) const;
/*! /*!
\brief \brief
return a pointer to the window containing the target property t o return a pointer to the window containing the target property t o
be accessed. be accessed.
\exception UnknownObjectException \exception UnknownObjectException
thrown if no such target window exists within the system. thrown if no such target window exists within the system.
\deprecated
This will be removed in 0.8.x. Use the version taking a suffix
string instead!
*/ */
const Window* getTargetWindow(const PropertyReceiver* receiver) con st; const Window* getTargetWindow(const PropertyReceiver* receiver) con st;
/*!
\deprecated
This will be removed in 0.8.x. Use the version taking a suffix
string instead!
*/
Window* getTargetWindow(PropertyReceiver* receiver); Window* getTargetWindow(PropertyReceiver* receiver);
String d_widgetNameSuffix; //! Return a pointer to the target window with the given suffix.
String d_targetProperty; const Window* getTargetWindow(const PropertyReceiver* receiver,
const String& name_suffix) const;
//! Return a pointer to the target window with the given suffix.
Window* getTargetWindow(PropertyReceiver* receiver,
const String& name_suffix);
//! Internal struct used to keep track of targets.
struct LinkTarget
{
//! name suffix of the target widget.
String d_widgetNameSuffix;
//! the property to use on the target widget.
String d_targetProperty;
};
//! type used for the collection of targets.
typedef std::vector<LinkTarget> LinkTargetCollection;
//! collection of targets for this PropertyLinkDefinition.
LinkTargetCollection d_targets;
}; };
} // End of CEGUI namespace section } // End of CEGUI namespace section
#if defined (_MSC_VER)
# pragma warning(pop)
#endif
#endif // end of guard _CEGUIFalPropertyLinkDefinition_h_ #endif // end of guard _CEGUIFalPropertyLinkDefinition_h_
 End of changes. 7 change blocks. 
3 lines changed or deleted 49 lines changed or added


 CEGUIFalSectionSpecification.h   CEGUIFalSectionSpecification.h 
skipping to change at line 61 skipping to change at line 61
\brief \brief
Constructor Constructor
\param owner \param owner
String holding the name of the WidgetLookFeel object that conta ins the target section. String holding the name of the WidgetLookFeel object that conta ins the target section.
\param sectionName \param sectionName
String holding the name of the target section. String holding the name of the target section.
\param controlPropertySource \param controlPropertySource
String holding the name of a boolean property that will control String holding the name of a property that will control whether
if rendering for this secion will actually occur or not.
the rendering for this secion will actually occur or not.
\param controlPropertyValue
String holding the value to be tested for from the property nam
ed in
controlPropertySource. If this is empty, then controlPropertyS
ource
will be accessed as a boolean property, otherwise rendering wil
l
only occur when the value returned via controlPropertySource ma
tches
the value specified here.
\param controlPropertyWidget
String holding either a widget name suffix or the special value
of
'__parent__' indicating the window upon which the property name
d
in controlPropertySource should be accessed. If this is empty
then
the window itself is used as the source, rather than a child or
the
parent.
*/ */
SectionSpecification(const String& owner, const String& sectionName SectionSpecification(const String& owner, const String& sectionName
, const String& controlPropertySource); ,
const String& controlPropertySource,
const String& controlPropertyValue,
const String& controlPropertyWidget);
/*! /*!
\brief \brief
Constructor Constructor
\param owner \param owner
String holding the name of the WidgetLookFeel object that conta ins the target section. String holding the name of the WidgetLookFeel object that conta ins the target section.
\param sectionName \param sectionName
String holding the name of the target section. String holding the name of the target section.
\param controlPropertySource \param controlPropertySource
String holding the name of a boolean property that will control String holding the name of a property that will control whether
if rendering for this secion will actually occur or not.
the rendering for this secion will actually occur or not.
\param controlPropertyValue
String holding the value to be tested for from the property nam
ed in
controlPropertySource. If this is empty, then controlPropertyS
ource
will be accessed as a boolean property, otherwise rendering wil
l
only occur when the value returned via controlPropertySource ma
tches
the value specified here.
\param controlPropertyWidget
String holding either a widget name suffix or the special value
of
'__parent__' indicating the window upon which the property name
d
in controlPropertySource should be accessed. If this is empty
then
the window itself is used as the source, rather than a child or
the
parent.
\param cols \param cols
Override colours to be used (modulates sections master colours) . Override colours to be used (modulates sections master colours) .
*/ */
SectionSpecification(const String& owner, const String& sectionName SectionSpecification(const String& owner, const String& sectionName
, const String& controlPropertySource, const ColourRect& cols); ,
const String& controlPropertySource,
const String& controlPropertyValue,
const String& controlPropertyWidget,
const ColourRect& cols);
/*! /*!
\brief \brief
Render the section specified by this SectionSpecification. Render the section specified by this SectionSpecification.
\param srcWindow \param srcWindow
Window object to be used when calculating pixel values from Bas eDim values. Window object to be used when calculating pixel values from Bas eDim values.
\return \return
Nothing. Nothing.
skipping to change at line 215 skipping to change at line 250
\param property \param property
String containing the name of the property. String containing the name of the property.
\return \return
Nothing. Nothing.
*/ */
void setRenderControlPropertySource(const String& property); void setRenderControlPropertySource(const String& property);
/*! /*!
\brief \brief
Set the test value used when determining whether to render this
section.
The value set here will be compared to the current value of the
property named as the render control property, if they match th
e
secion will be drawn, otherwise the section will not be drawn.
If
this value is set to the empty string, the control property wil
l
instead be treated as a boolean property.
*/
void setRenderControlValue(const String& value);
/*!
\brief
Set the widget what will be used as the source of the property
named as the control property.
The value of this setting will be interpreted as follows:
- empty string: The target widget being drawn will be the sourc
e of
the property value.
- '__parent__': The parent of the widget being drawn will be th
e
source of the property value.
- any other value: The value will be taken as a name suffix and
a window with the name of the widget being drawn with the
specified suffix will be the source of the property value.
*/
void setRenderControlWidget(const String& widget);
/*!
\brief
Writes an xml representation of this SectionSpecification to \a out_stream. Writes an xml representation of this SectionSpecification to \a out_stream.
\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;
skipping to change at line 238 skipping to change at line 302
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
section sepcification is set up. section sepcification 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
- the integral d_coloursOverride values. - the integral d_coloursOverride values.
- or default to colour(1,1,1,1); - or default to colour(1,1,1,1);
*/ */
void initColourRectForOverride(const Window& wnd, ColourRect& cr) c onst; void initColourRectForOverride(const Window& wnd, ColourRect& cr) c onst;
/** return whether the section should be drawn, based upon the
* render control property and associated items.
*/
bool shouldBeDrawn(const Window& wnd) const;
private: private:
String d_owner; //!< Name of the WidgetLook Feel containing the required section. String d_owner; //!< Name of the WidgetLook Feel containing the required section.
String d_sectionName; //!< Name of the required s ection within the specified WidgetLookFeel. String d_sectionName; //!< Name of the required s ection within the specified WidgetLookFeel.
ColourRect d_coloursOverride; //!< Colours to use when ov erride is enabled. ColourRect d_coloursOverride; //!< Colours to use when ov erride is enabled.
bool d_usingColourOverride; //!< true if colour overrid e is enabled. bool d_usingColourOverride; //!< true if colour overrid e is enabled.
String d_colourPropertyName; //!< name of property to fe tch colours from. String d_colourPropertyName; //!< name of property to fe tch colours from.
bool d_colourProperyIsRect; //!< true if the colour pro perty will fetch a full ColourRect. bool d_colourProperyIsRect; //!< true if the colour pro perty will fetch a full ColourRect.
String d_renderControlProperty; //!< Name of a 'boolean //! Name of a property to control whether to draw this section.
' property that controls whether to actually draw this section. String d_renderControlProperty;
//! Comparison value to test against d_renderControlProperty.
String d_renderControlValue;
//! Widget upon which d_renderControlProperty is to be accessed.
String d_renderControlWidget;
}; };
} // End of CEGUI namespace section } // End of CEGUI namespace section
#endif // end of guard _CEGUIFalSectionSpecification_h_ #endif // end of guard _CEGUIFalSectionSpecification_h_
 End of changes. 7 change blocks. 
12 lines changed or deleted 104 lines changed or added


 CEGUIFalTextComponent.h   CEGUIFalTextComponent.h 
skipping to change at line 57 skipping to change at line 57
*/ */
class CEGUIEXPORT TextComponent : public FalagardComponentBase class CEGUIEXPORT TextComponent : public FalagardComponentBase
{ {
public: public:
/*! /*!
\brief \brief
Constructor Constructor
*/ */
TextComponent(); TextComponent();
//! Destructor
~TextComponent();
//! Copy constructor
TextComponent(const TextComponent& obj);
//! Assignment
TextComponent& operator=(const TextComponent& other);
/*! /*!
\brief \brief
Return the text object that will be rendered by this TextCompon ent. Return the text object that will be rendered by this TextCompon ent.
\return \return
String object containing the text that will be rendered. String object containing the text that will be rendered.
*/ */
const String& getText() const; const String& getText() const;
//! return text string with \e visual ordering of glyphs. //! return text string with \e visual ordering of glyphs.
 End of changes. 1 change blocks. 
0 lines changed or deleted 9 lines changed or added


 CEGUIFalWidgetLookFeel.h   CEGUIFalWidgetLookFeel.h 
skipping to change at line 305 skipping to change at line 305
\brief \brief
Clear all defined property link definitions from the WidgetLook Feel Clear all defined property link definitions from the WidgetLook Feel
\return \return
Nothing. Nothing.
*/ */
void clearPropertyLinkDefinitions(); void clearPropertyLinkDefinitions();
/*! /*!
\brief \brief
Add the name of an animation that is associated with the
WidgetLookFeel.
\param anim_name
Reference to a String object that contains the name of the anim
ation
to be associated with this WidgetLookFeel.
*/
void addAnimationName(const String& anim_name);
/*!
\brief
Writes an xml representation of this WidgetLookFeel to \a out_s tream. Writes an xml representation of this WidgetLookFeel 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;
skipping to change at line 379 skipping to change at line 390
* @access public * @access public
* @return CEGUI::WidgetLookFeel::PropertyList List of properties * @return CEGUI::WidgetLookFeel::PropertyList List of properties
*/ */
const PropertyList& getProperties() const { return d_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<String> AnimationList;
typedef std::multimap<Window*, AnimationInstance*> AnimationInst
anceMap;
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.
//! Collection of animation names associated with this WidgetLookFe
el.
AnimationList d_animations;
//! map of windows and their associated animation instances
mutable AnimationInstanceMap d_animationInstances;
}; };
} // 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 _CEGUIFalWidgetLookFeel_h_ #endif // end of guard _CEGUIFalWidgetLookFeel_h_
 End of changes. 3 change blocks. 
0 lines changed or deleted 20 lines changed or added


 CEGUIFalWidgetLookManager.h   CEGUIFalWidgetLookManager.h 
/*********************************************************************** /***********************************************************************
filename: CEGUIFalWidgetLookManager.h filename: CEGUIFalWidgetLookManager.h
created: Mon Jun 13 2005 created: Mon Jun 13 2005
author: Paul D Turner <paul@cegui.org.uk> author: Paul D Turner <paul@cegui.org.uk>
*************************************************************************/ *************************************************************************/
/************************************************************************** * /************************************************************************** *
* Copyright (C) 2004 - 2006 Paul D Turner & The CEGUI Development Team * Copyright (C) 2004 - 2010 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 76 skipping to change at line 76
\brief \brief
Return singleton WidgetLookManager object Return singleton WidgetLookManager object
\return \return
Singleton WidgetLookManager object Singleton WidgetLookManager object
*/ */
static WidgetLookManager& getSingleton(void); static WidgetLookManager& getSingleton(void);
/*! /*!
\brief \brief
Return pointer to singleton WindowFactoryManager obj ect Return pointer to singleton WidgetLookManager object
\return \return
Pointer to singleton WindowFactoryManager object Pointer to singleton WidgetLookManager object
*/ */
static WidgetLookManager* getSingletonPtr(void); static WidgetLookManager* getSingletonPtr(void);
/*! /*!
\brief \brief
Parses a file containing window look & feel specifications (in the form of XML). Parses a file containing window look & feel specifications (in the form of XML).
\note \note
If the new file contains specifications for widget types that a re already specified, it is not an error; If the new file contains specifications for widget types that a re already specified, it is not an error;
the previous definitions are overwritten by the new data. An e ntry will appear in the log each time any the previous definitions are overwritten by the new data. An e ntry will appear in the log each time any
skipping to change at line 114 skipping to change at line 114
void parseLookNFeelSpecification(const String& filename, const Stri ng& resourceGroup = ""); void parseLookNFeelSpecification(const String& filename, const Stri ng& resourceGroup = "");
/*! /*!
\brief \brief
Return whether a WidgetLookFeel has been created with the speci fied name. Return whether a WidgetLookFeel has been created with the speci fied name.
\param widget \param widget
String object holding the name of a widget look to test for. String object holding the name of a widget look to test for.
\return \return
- true if a WindowLookFeel named \a widget is available. - true if a WidgetLookFeel named \a widget is available.
- false if so such WindowLookFeel is currently available. - false if so such WidgetLookFeel is currently available.
*/ */
bool isWidgetLookAvailable(const String& widget) const; bool isWidgetLookAvailable(const String& widget) const;
/*! /*!
\brief \brief
Return a const reference to a WidgetLookFeel object which has t he specified name. Return a const reference to a WidgetLookFeel object which has t he specified name.
\param widget \param widget
String object holding the name of a widget look that is to be r eturned. String object holding the name of a widget look that is to be r eturned.
\return \return
const reference to the requested WidgetLookFeel object. const reference to the requested WidgetLookFeel object.
\exception UnknownObjectException thrown if no WindowLookFeel is available with the requested name. \exception UnknownObjectException thrown if no WidgetLookFeel is available with the requested name.
*/ */
const WidgetLookFeel& getWidgetLook(const String& widget) const; const WidgetLookFeel& getWidgetLook(const String& widget) const;
/*! /*!
\brief \brief
Erase the WidgetLookFeel that has the specified name. Erase the WidgetLookFeel that has the specified name.
\param widget \param widget
String object holding the name of a widget look to be erased. If no such WindowLookFeel exists, nothing String object holding the name of a widget look to be erased. If no such WidgetLookFeel exists, nothing
happens. happens.
\return \return
Nothing. Nothing.
*/ */
void eraseWidgetLook(const String& widget); void eraseWidgetLook(const String& widget);
/*! /*!
\brief \brief
Add the given WidgetLookFeel. Add the given WidgetLookFeel.
 End of changes. 6 change blocks. 
7 lines changed or deleted 7 lines changed or added


 CEGUIFont_xmlHandler.h   CEGUIFont_xmlHandler.h 
skipping to change at line 32 skipping to change at line 32
* 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 _CEGUIFont_xmlHandler_h_ #ifndef _CEGUIFont_xmlHandler_h_
#define _CEGUIFont_xmlHandler_h_ #define _CEGUIFont_xmlHandler_h_
#include "CEGUIXMLHandler.h" #include "CEGUIXMLHandler.h"
#include "CEGUIString.h"
// Start of CEGUI namespace section // Start of CEGUI namespace section
namespace CEGUI namespace CEGUI
{ {
//! Handler class used to parse the Font XML files to create Font objects. //! Handler class used to parse the Font XML files to create Font objects.
class CEGUIEXPORT Font_xmlHandler : public XMLHandler class CEGUIEXPORT Font_xmlHandler : public XMLHandler
{ {
public: public:
//! Filename of the XML schema used for validating Font files. //! Filename of the XML schema used for validating Font files.
static const String FontSchemaName; static const String FontSchemaName;
skipping to change at line 60 skipping to change at line 61
//! Attribute name that stores the filename of the font source (font / imageset) //! Attribute name that stores the filename of the font source (font / imageset)
static const String FontFilenameAttribute; static const String FontFilenameAttribute;
//! Attribute name that stores the resource group of the font source. //! Attribute name that stores the resource group of the font source.
static const String FontResourceGroupAttribute; static const String FontResourceGroupAttribute;
//! Attribute name that stores the auto-scaled setting. //! Attribute name that stores the auto-scaled setting.
static const String FontAutoScaledAttribute; static const String FontAutoScaledAttribute;
//! Attribute name that stores the horizontal native resolution. //! Attribute name that stores the horizontal native resolution.
static const String FontNativeHorzResAttribute; static const String FontNativeHorzResAttribute;
//! Attribute name that stores the vertical native resolution. //! Attribute name that stores the vertical native resolution.
static const String FontNativeVertResAttribute; static const String FontNativeVertResAttribute;
//! Attribute name that stores the line height that we'll report for th
is font.
static const String FontLineSpacingAttribute;
//! Attribute name that stores the font point size. //! Attribute name that stores the font point size.
static const String FontSizeAttribute; static const String FontSizeAttribute;
//! Attribute name that stores the font anti-aliasing setting. //! Attribute name that stores the font anti-aliasing setting.
static const String FontAntiAliasedAttribute; static const String FontAntiAliasedAttribute;
//! Attribute name that stores the codepoint value for a mapping //! Attribute name that stores the codepoint value for a mapping
static const String MappingCodepointAttribute; static const String MappingCodepointAttribute;
//! Attribute name that stores the image name for a mapping //! Attribute name that stores the image name for a mapping
static const String MappingImageAttribute; static const String MappingImageAttribute;
//! Attribute name that stores the horizontal advance value for a mappi ng. //! Attribute name that stores the horizontal advance value for a mappi ng.
static const String MappingHorzAdvanceAttribute; static const String MappingHorzAdvanceAttribute;
 End of changes. 2 change blocks. 
0 lines changed or deleted 4 lines changed or added


 CEGUIForwardRefs.h   CEGUIForwardRefs.h 
skipping to change at line 39 skipping to change at line 39
************************************************************************** */ ************************************************************************** */
#ifndef _CEGUIForwardRefs_h_ #ifndef _CEGUIForwardRefs_h_
#define _CEGUIForwardRefs_h_ #define _CEGUIForwardRefs_h_
// Start of CEGUI namespace section // Start of CEGUI namespace section
namespace CEGUI namespace CEGUI
{ {
/************************************************************************* /*************************************************************************
Forward declare majority of core classes Forward declare majority of core classes
*************************************************************************/ *************************************************************************/
class Affector;
class Animation;
class AnimationInstance;
class AnimationManager;
class BasicRenderedStringParser; class BasicRenderedStringParser;
class BiDiVisualMapping; class BiDiVisualMapping;
class CentredRenderedString; class CentredRenderedString;
class colour; class colour;
class ColourRect; class ColourRect;
class CoordConverter; class CoordConverter;
class DefaultLogger; class DefaultLogger;
class DefaultRenderedStringParser; class DefaultRenderedStringParser;
class DefaultResourceProvider; class DefaultResourceProvider;
class DynamicModule; class DynamicModule;
skipping to change at line 65 skipping to change at line 69
class FontGlyph; class FontGlyph;
class FontManager; class FontManager;
class FormattedRenderedString; class FormattedRenderedString;
class GeometryBuffer; class GeometryBuffer;
class GlobalEventSet; class GlobalEventSet;
class Image; class Image;
class ImageCodec; class ImageCodec;
class ImagerySection; class ImagerySection;
class Imageset; class Imageset;
class ImagesetManager; class ImagesetManager;
class Interpolator;
class JustifiedRenderedString; class JustifiedRenderedString;
class KeyFrame;
class LeftAlignedRenderedString; class LeftAlignedRenderedString;
class Logger; class Logger;
class MouseCursor; class MouseCursor;
class Property; class Property;
class PropertyHelper; class PropertyHelper;
class PropertyReceiver; class PropertyReceiver;
class PropertySet; class PropertySet;
class RawDataContainer; class RawDataContainer;
class Rect; class Rect;
class RegexMatcher; class RegexMatcher;
class RenderedString; class RenderedString;
class RenderedStringComponent; class RenderedStringComponent;
class RenderedStringImageComponent; class RenderedStringImageComponent;
class RenderedStringParser; class RenderedStringParser;
class RenderedStringTextComponent; class RenderedStringTextComponent;
class RenderedStringWidgetComponent; class RenderedStringWidgetComponent;
class Renderer; class Renderer;
class RenderEffect; class RenderEffect;
class RenderEffectManager;
struct RenderingContext; struct RenderingContext;
class RenderingRoot; class RenderingRoot;
class RenderingSurface; class RenderingSurface;
class RenderingWindow; class RenderingWindow;
class RenderQueue; class RenderQueue;
class RenderSystem; class RenderSystem;
class RenderTarget; class RenderTarget;
class ResourceEventSet; class ResourceEventSet;
class ResourceProvider; class ResourceProvider;
class RightAlignedRenderedString; class RightAlignedRenderedString;
class Scheme; class Scheme;
class SchemeManager; class SchemeManager;
class ScriptFunctor; class ScriptFunctor;
class ScriptModule; class ScriptModule;
class Size; class Size;
class String; class String;
class System; class System;
class Texture; class Texture;
class TextureTarget; class TextureTarget;
class TextUtils; class TextUtils;
class UBox;
class UDim;
class URect;
class UVector2;
class Vector2; class Vector2;
class Vector3; class Vector3;
struct Vertex; struct Vertex;
class WidgetLookFeel; class WidgetLookFeel;
class Window; class Window;
class WindowFactory; class WindowFactory;
class WindowFactoryManager; class WindowFactoryManager;
class WindowManager; class WindowManager;
class WindowRenderer; class WindowRenderer;
class WindowRendererModule; class WindowRendererModule;
skipping to change at line 130 skipping to change at line 141
Forward declare window / widget classes. Forward declare window / widget classes.
*************************************************************************/ *************************************************************************/
class ButtonBase; class ButtonBase;
class Checkbox; class Checkbox;
class ClippedContainer; class ClippedContainer;
class Combobox; class Combobox;
class ComboDropList; class ComboDropList;
class DragContainer; class DragContainer;
class Editbox; class Editbox;
class FrameWindow; class FrameWindow;
class GridLayoutContainer;
class GUISheet; class GUISheet;
class HorizontalLayoutContainer;
class ItemEntry; class ItemEntry;
class ItemListBase; class ItemListBase;
class ItemListbox; class ItemListbox;
class LayoutContainer;
class Listbox; class Listbox;
class ListboxItem; class ListboxItem;
class ListboxTextItem; class ListboxTextItem;
class ListHeader; class ListHeader;
class ListHeaderSegment; class ListHeaderSegment;
class Menubar; class Menubar;
class MenuBase; class MenuBase;
class MenuItem; class MenuItem;
class MultiColumnList; class MultiColumnList;
class MultiLineEditbox; class MultiLineEditbox;
class PopupMenu; class PopupMenu;
class ProgressBar; class ProgressBar;
class PushButton; class PushButton;
class RadioButton; class RadioButton;
class ScrollablePane; class ScrollablePane;
class Scrollbar; class Scrollbar;
class ScrolledContainer; class ScrolledContainer;
class ScrolledItemListBase; class ScrolledItemListBase;
class SequentialLayoutContainer;
class Slider; class Slider;
class Spinner; class Spinner;
class TabButton; class TabButton;
class TabControl; class TabControl;
class Thumb; class Thumb;
class Titlebar; class Titlebar;
class Tooltip; class Tooltip;
class Tree; class Tree;
class TreeItem; class TreeItem;
class VerticalLayoutContainer;
/************************************************************************* /*************************************************************************
Forward declare EventArg based classes. Forward declare EventArg based classes.
*************************************************************************/ *************************************************************************/
class ActivationEventArgs; class ActivationEventArgs;
class DisplayEventArgs; class DisplayEventArgs;
class DragDropEventArgs; class DragDropEventArgs;
class HeaderSequenceEventArgs; class HeaderSequenceEventArgs;
class KeyEventArgs; class KeyEventArgs;
class MouseCursorEventArgs; class MouseCursorEventArgs;
 End of changes. 10 change blocks. 
0 lines changed or deleted 16 lines changed or added


 CEGUIFrameWindow.h   CEGUIFrameWindow.h 
skipping to change at line 59 skipping to change at line 59
class CEGUIEXPORT FrameWindow : public Window class CEGUIEXPORT FrameWindow : public Window
{ {
public: public:
static const String EventNamespace; //!< Namespace for global events static const String EventNamespace; //!< Namespace for global events
static const String WidgetTypeName; //!< Window factory nam e static const String WidgetTypeName; //!< Window factory nam e
/******************************************************************* ****** /******************************************************************* ******
Constants Constants
******************************************************************** *****/ ******************************************************************** *****/
// additional event names for this window // additional event names for this window
static const String EventRollupToggled; //!< Fired when the /** Event fired when the rollup (shade) state of the window is changed.
rollup (shade) state of the window changes * Handlers are passed a const WindowEventArgs reference with
static const String EventCloseClicked; //!< Fired when the * WindowEventArgs::window set to the FrameWindow whose rolled up state
close button for the window is clicked. * has been changed.
//! Fired when drag-sizing of the window starts. */
static const String EventRollupToggled;
/** Event fired when the close button for the window is clicked.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the FrameWindow whose close button wa
s
* clicked.
*/
static const String EventCloseClicked;
/** Event fired when drag-sizing of the window starts.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the FrameWindow that has started to b
e
* drag sized.
*/
static const String EventDragSizingStarted; static const String EventDragSizingStarted;
//! Fired when drag-sizing of the window ends. /** Event fired when drag-sizing of the window ends.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the FrameWindow for which drag sizing
has
* ended.
*/
static const String EventDragSizingEnded; static const String EventDragSizingEnded;
// other bits // other bits
static const float DefaultSizingBorderSize; //!< Default size for the sizing border (in pixels) static const float DefaultSizingBorderSize; //!< Default size for the sizing border (in pixels)
/********************************************************************** *** /********************************************************************** ***
Child Widget name suffix constants Child Widget name suffix constants
*********************************************************************** **/ *********************************************************************** **/
static const String TitlebarNameSuffix; //!< Widget name suffix fo r the titlebar component. static const String TitlebarNameSuffix; //!< Widget name suffix fo r the titlebar component.
static const String CloseButtonNameSuffix; //!< Widget name suffix fo r the close button component. static const String CloseButtonNameSuffix; //!< Widget name suffix fo r the close button component.
skipping to change at line 474 skipping to change at line 492
*/ */
PushButton* getCloseButton() const; PushButton* getCloseButton() const;
/******************************************************************* ****** /******************************************************************* ******
Construction / Destruction Construction / Destruction
******************************************************************** *****/ ******************************************************************** *****/
/*! /*!
\brief \brief
Constructor for FrameWindow objects. Constructor for FrameWindow objects.
*/ */
FrameWindow(const String& name, const String& type); FrameWindow(const String& type, const String& name);
/*! /*!
\brief \brief
Destructor for FramwWindow objects. Destructor for FramwWindow objects.
*/ */
virtual ~FrameWindow(void); virtual ~FrameWindow(void);
protected: protected:
/******************************************************************* ****** /******************************************************************* ******
Implementation Functions Implementation Functions
 End of changes. 3 change blocks. 
7 lines changed or deleted 26 lines changed or added


 CEGUIFreeTypeFont.h   CEGUIFreeTypeFont.h 
skipping to change at line 90 skipping to change at line 90
maintain the same physical size (which is calculated by using the maintain the same physical size (which is calculated by using the
native resolution setting). native resolution setting).
\param native_horz_res \param native_horz_res
The horizontal native resolution value. This is only significant w hen The horizontal native resolution value. This is only significant w hen
auto scaling is enabled. auto scaling is enabled.
\param native_vert_res \param native_vert_res
The vertical native resolution value. This is only significant whe n The vertical native resolution value. This is only significant whe n
auto scaling is enabled. auto scaling is enabled.
\param specific_line_spacing
If specified (non-zero), this will be the line spacing that we will
report for this font, regardless of what is mentioned in the font f
ile
itself.
*/ */
FreeTypeFont(const String& font_name, const float point_size, FreeTypeFont(const String& font_name, const float point_size,
const bool anti_aliased, const String& font_filename, const bool anti_aliased, const String& font_filename,
const String& resource_group = "", const String& resource_group = "",
const bool auto_scaled = false, const bool auto_scaled = false,
const float native_horz_res = 640.0f, const float native_horz_res = 640.0f,
const float native_vert_res = 480.0f); const float native_vert_res = 480.0f,
const float specific_line_spacing = 0.0f);
//! Destructor. //! Destructor.
~FreeTypeFont(); ~FreeTypeFont();
//! return the point size of the freetype font. //! return the point size of the freetype font.
float getPointSize() const; float getPointSize() const;
//! return whether the freetype font is rendered anti-aliased. //! return whether the freetype font is rendered anti-aliased.
bool isAntiAliased() const; bool isAntiAliased() const;
skipping to change at line 153 skipping to change at line 159
//! Register all properties of this class. //! Register all properties of this class.
void addFreeTypeFontProperties(); void addFreeTypeFontProperties();
//! Free all allocated font data. //! Free all allocated font data.
void free(); void free();
// overrides of functions in Font base class. // overrides of functions in Font base class.
void rasterise(utf32 start_codepoint, utf32 end_codepoint) const; void rasterise(utf32 start_codepoint, utf32 end_codepoint) const;
void updateFont(); void updateFont();
void writeXMLToStream_impl (XMLSerializer& xml_stream) const; void writeXMLToStream_impl (XMLSerializer& xml_stream) const;
//! If non-zero, the overridden line spacing that we're to report.
float d_specificLineSpacing;
//! Point size of font. //! Point size of font.
float d_ptSize; float d_ptSize;
//! True if the font should be rendered as anti-alaised by freeType. //! True if the font should be rendered as anti-alaised by freeType.
bool d_antiAliased; bool d_antiAliased;
//! FreeType-specific font handle //! FreeType-specific font handle
FT_Face d_fontFace; FT_Face d_fontFace;
//! Font file data //! Font file data
RawDataContainer d_fontData; RawDataContainer d_fontData;
//! Type definition for ImagesetVector. //! Type definition for ImagesetVector.
typedef std::vector<Imageset*> ImagesetVector; typedef std::vector<Imageset*> ImagesetVector;
 End of changes. 3 change blocks. 
1 lines changed or deleted 10 lines changed or added


 CEGUIGeometryBuffer.h   CEGUIGeometryBuffer.h 
/*********************************************************************** /***********************************************************************
filename: CEGUIGeometryBuffer.h filename: CEGUIGeometryBuffer.h
created: Thu Jan 8 2009 created: Thu Jan 8 2009
author: Paul D Turner author: Paul D Turner
*************************************************************************/ *************************************************************************/
/************************************************************************** * /************************************************************************** *
* Copyright (C) 2004 - 2009 Paul D Turner & The CEGUI Development Team * Copyright (C) 2004 - 2010 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 32 skipping to change at line 32
* 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 _CEGUIGeometryBuffer_h_ #ifndef _CEGUIGeometryBuffer_h_
#define _CEGUIGeometryBuffer_h_ #define _CEGUIGeometryBuffer_h_
#include "CEGUIBase.h" #include "CEGUIBase.h"
#include "CEGUIRenderer.h"
// Start of CEGUI namespace section // Start of CEGUI namespace section
namespace CEGUI namespace CEGUI
{ {
/*! /*!
\brief \brief
Abstract class defining the interface for objects that buffer geometry for Abstract class defining the interface for objects that buffer geometry for
later rendering. later rendering.
*/ */
class CEGUIEXPORT GeometryBuffer class CEGUIEXPORT GeometryBuffer
{ {
public: public:
//! Destructor //! Destructor
virtual ~GeometryBuffer() virtual ~GeometryBuffer();
{}
/*! /*!
\brief \brief
Draw the geometry buffered within this GeometryBuffer object. Draw the geometry buffered within this GeometryBuffer object.
*/ */
virtual void draw() const = 0; virtual void draw() const = 0;
/*! /*!
\brief \brief
Set the translation to be applied to the geometry in the buffer whe n it Set the translation to be applied to the geometry in the buffer whe n it
skipping to change at line 189 skipping to change at line 189
be in use! be in use!
*/ */
virtual void setRenderEffect(RenderEffect* effect) = 0; virtual void setRenderEffect(RenderEffect* effect) = 0;
/*! /*!
\brief \brief
Return the RenderEffect object that is assigned to this GeometryBuf fer Return the RenderEffect object that is assigned to this GeometryBuf fer
or 0 if none. or 0 if none.
*/ */
virtual RenderEffect* getRenderEffect() = 0; virtual RenderEffect* getRenderEffect() = 0;
/*!
\brief
Set the blend mode option to use when rendering this GeometryBuffer
.
\note
The blend mode setting is not a 'state' setting, but is used for \e
all
geometry added to the buffer regardless of when the blend mode is s
et.
\param mode
One of the BlendMode enumerated values indicating the blending mode
to
be used.
*/
virtual void setBlendMode(const BlendMode mode);
/*!
\brief
Return the blend mode that is set to be used for this GeometryBuffe
r.
\return
One of the BlendMode enumerated values indicating the blending mode
that will be used when rendering all geometry added to this
GeometryBuffer object.
*/
virtual BlendMode getBlendMode() const;
protected:
//! Constructor.
GeometryBuffer();
//! The BlendMode to use when rendering this GeometryBuffer.
BlendMode d_blendMode;
}; };
} // End of CEGUI namespace section } // End of CEGUI namespace section
#endif // end of guard _CEGUIGeometryBuffer_h_ #endif // end of guard _CEGUIGeometryBuffer_h_
 End of changes. 4 change blocks. 
3 lines changed or deleted 40 lines changed or added


 CEGUIImageset_xmlHandler.h   CEGUIImageset_xmlHandler.h 
skipping to change at line 32 skipping to change at line 32
* 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 _CEGUIImageset_xmlHandler_h_ #ifndef _CEGUIImageset_xmlHandler_h_
#define _CEGUIImageset_xmlHandler_h_ #define _CEGUIImageset_xmlHandler_h_
#include "CEGUIXMLHandler.h" #include "CEGUIXMLHandler.h"
#include "CEGUIString.h"
// Start of CEGUI namespace section // Start of CEGUI namespace section
namespace CEGUI namespace CEGUI
{ {
//! Class used to parse the Imageset XML files to create Imageset objects //! Class used to parse the Imageset XML files to create Imageset objects
class CEGUIEXPORT Imageset_xmlHandler : public XMLHandler class CEGUIEXPORT Imageset_xmlHandler : public XMLHandler
{ {
public: public:
//! Constructor. //! Constructor.
Imageset_xmlHandler(const String& filename, const String& resource_grou p); Imageset_xmlHandler(const String& filename, const String& resource_grou p);
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 CEGUIInputEvent.h   CEGUIInputEvent.h 
skipping to change at line 180 skipping to change at line 180
ArrowUp =0xC8, /* UpArrow on arrow keypad */ ArrowUp =0xC8, /* UpArrow on arrow keypad */
PageUp =0xC9, /* PgUp on arrow keypad */ PageUp =0xC9, /* PgUp on arrow keypad */
ArrowLeft =0xCB, /* LeftArrow on arrow keypad */ ArrowLeft =0xCB, /* LeftArrow on arrow keypad */
ArrowRight =0xCD, /* RightArrow on arrow keypad */ ArrowRight =0xCD, /* RightArrow on arrow keypad */
End =0xCF, /* End on arrow keypad */ End =0xCF, /* End on arrow keypad */
ArrowDown =0xD0, /* DownArrow on arrow keypad */ ArrowDown =0xD0, /* DownArrow on arrow keypad */
PageDown =0xD1, /* PgDn on arrow keypad */ PageDown =0xD1, /* PgDn on arrow keypad */
Insert =0xD2, /* Insert on arrow keypad */ Insert =0xD2, /* Insert on arrow keypad */
Delete =0xD3, /* Delete on arrow keypad */ Delete =0xD3, /* Delete on arrow keypad */
LeftWindows =0xDB, /* Left Windows key */ LeftWindows =0xDB, /* Left Windows key */
RightWindow =0xDC, /* Right Windows key */
RightWindows =0xDC, /* Right Windows key - Correct spelling : ) */ RightWindows =0xDC, /* Right Windows key - Correct spelling : ) */
AppMenu =0xDD, /* AppMenu key */ AppMenu =0xDD, /* AppMenu key */
Power =0xDE, /* System Power */ Power =0xDE, /* System Power */
Sleep =0xDF, /* System Sleep */ Sleep =0xDF, /* System Sleep */
Wake =0xE3, /* System Wake */ Wake =0xE3, /* System Wake */
WebSearch =0xE5, /* Web Search */ WebSearch =0xE5, /* Web Search */
WebFavorites =0xE6, /* Web Favorites */ WebFavorites =0xE6, /* Web Favorites */
WebRefresh =0xE7, /* Web Refresh */ WebRefresh =0xE7, /* Web Refresh */
WebStop =0xE8, /* Web Stop */ WebStop =0xE8, /* Web Stop */
WebForward =0xE9, /* Web Forward */ WebForward =0xE9, /* Web Forward */
 End of changes. 1 change blocks. 
1 lines changed or deleted 0 lines changed or added


 CEGUIIrrlichtEventPusher.h   CEGUIIrrlichtEventPusher.h 
skipping to change at line 42 skipping to change at line 42
#include <irrlicht.h> #include <irrlicht.h>
namespace CEGUI namespace CEGUI
{ {
using namespace irr; using namespace irr;
class IrrlichtEventPusher class IrrlichtEventPusher
{ {
gui::ICursorControl* d_cursorctrl; gui::ICursorControl* d_cursorctrl;
core::position2d<s32> d_pos;
core::position2d<s32> d_dpos;
public : public :
IrrlichtEventPusher(irr::gui::ICursorControl* ctrl) : IrrlichtEventPusher(irr::gui::ICursorControl* ctrl) :
d_cursorctrl(ctrl) d_cursorctrl(ctrl)
{ {
d_cursorctrl->setPosition(0.5f, 0.5f);
d_pos = d_cursorctrl->getPosition();
d_dpos.X = 0;
d_dpos.Y = 0;
initCodes(); initCodes();
}; };
virtual ~IrrlichtEventPusher(){}; virtual ~IrrlichtEventPusher(){};
bool OnEvent(const SEvent& event) bool OnEvent(const SEvent& event)
{ {
switch (event.EventType) switch (event.EventType)
{ {
case EET_KEY_INPUT_EVENT : case EET_KEY_INPUT_EVENT :
skipping to change at line 233 skipping to change at line 226
irr2ceCODE[KEY_KEY_R ] = Key::R; // R key irr2ceCODE[KEY_KEY_R ] = Key::R; // R key
irr2ceCODE[KEY_KEY_S ] = Key::S; // S key irr2ceCODE[KEY_KEY_S ] = Key::S; // S key
irr2ceCODE[KEY_KEY_T ] = Key::T; // T key irr2ceCODE[KEY_KEY_T ] = Key::T; // T key
irr2ceCODE[KEY_KEY_U ] = Key::U; // U key irr2ceCODE[KEY_KEY_U ] = Key::U; // U key
irr2ceCODE[KEY_KEY_V ] = Key::V; // V key irr2ceCODE[KEY_KEY_V ] = Key::V; // V key
irr2ceCODE[KEY_KEY_W ] = Key::W; // W key irr2ceCODE[KEY_KEY_W ] = Key::W; // W key
irr2ceCODE[KEY_KEY_X ] = Key::X; // X key irr2ceCODE[KEY_KEY_X ] = Key::X; // X key
irr2ceCODE[KEY_KEY_Y ] = Key::Y; // Y key irr2ceCODE[KEY_KEY_Y ] = Key::Y; // Y key
irr2ceCODE[KEY_KEY_Z ] = Key::Z; // Z key irr2ceCODE[KEY_KEY_Z ] = Key::Z; // Z key
irr2ceCODE[KEY_LWIN ] = Key::LeftWindows; // Left Windows key (Microsoft� Natural� keyboard) irr2ceCODE[KEY_LWIN ] = Key::LeftWindows; // Left Windows key (Microsoft� Natural� keyboard)
irr2ceCODE[KEY_RWIN ] = Key::RightWindow; // Right Windows ke y (Natural keyboard) irr2ceCODE[KEY_RWIN ] = Key::RightWindows; // Right Windows k ey (Natural keyboard)
irr2ceCODE[KEY_APPS ] = Key::AppMenu; //Applications key (Nat ural keyboard) irr2ceCODE[KEY_APPS ] = Key::AppMenu; //Applications key (Nat ural keyboard)
irr2ceCODE[KEY_SLEEP ] = Key::Sleep; // Computer Sleep key irr2ceCODE[KEY_SLEEP ] = Key::Sleep; // Computer Sleep key
irr2ceCODE[KEY_NUMPAD0 ] = Key::Numpad0; // Numeric keypad 0 key irr2ceCODE[KEY_NUMPAD0 ] = Key::Numpad0; // Numeric keypad 0 key
irr2ceCODE[KEY_NUMPAD1 ] = Key::Numpad1; // Numeric keypad 1 key irr2ceCODE[KEY_NUMPAD1 ] = Key::Numpad1; // Numeric keypad 1 key
irr2ceCODE[KEY_NUMPAD2 ] = Key::Numpad2; // Numeric keypad 2 key irr2ceCODE[KEY_NUMPAD2 ] = Key::Numpad2; // Numeric keypad 2 key
irr2ceCODE[KEY_NUMPAD3 ] = Key::Numpad3; // Numeric keypad 3 key irr2ceCODE[KEY_NUMPAD3 ] = Key::Numpad3; // Numeric keypad 3 key
irr2ceCODE[KEY_NUMPAD4 ] = Key::Numpad4; // Numeric keypad 4 key irr2ceCODE[KEY_NUMPAD4 ] = Key::Numpad4; // Numeric keypad 4 key
irr2ceCODE[KEY_NUMPAD5 ] = Key::Numpad5; // Numeric keypad 5 key irr2ceCODE[KEY_NUMPAD5 ] = Key::Numpad5; // Numeric keypad 5 key
irr2ceCODE[KEY_NUMPAD6 ] = Key::Numpad6; // Numeric keypad 6 key irr2ceCODE[KEY_NUMPAD6 ] = Key::Numpad6; // Numeric keypad 6 key
irr2ceCODE[KEY_NUMPAD7 ] = Key::Numpad7; // Numeric keypad 7 key irr2ceCODE[KEY_NUMPAD7 ] = Key::Numpad7; // Numeric keypad 7 key
 End of changes. 3 change blocks. 
8 lines changed or deleted 1 lines changed or added


 CEGUIIrrlichtGeometryBuffer.h   CEGUIIrrlichtGeometryBuffer.h 
skipping to change at line 58 skipping to change at line 58
//! GeometryBuffer implementation for the Irrlicht engine. //! GeometryBuffer implementation for the Irrlicht engine.
class IRR_GUIRENDERER_API IrrlichtGeometryBuffer : public GeometryBuffer class IRR_GUIRENDERER_API IrrlichtGeometryBuffer : public GeometryBuffer
{ {
public: public:
//! constructor //! constructor
IrrlichtGeometryBuffer(irr::video::IVideoDriver& driver); IrrlichtGeometryBuffer(irr::video::IVideoDriver& driver);
//! return the transformation matrix used for this buffer. //! return the transformation matrix used for this buffer.
const irr::core::matrix4& getMatrix() const; const irr::core::matrix4& getMatrix() const;
//! return reference to the Irrlicht material used with this GeometryBu
ffer.
irr::video::SMaterial& getMaterial();
//! return reference to the Irrlicht material used with this GeometryBu
ffer.
const irr::video::SMaterial& getMaterial() const;
// implement GeometryBuffer interface // implement GeometryBuffer interface
void draw() const; void draw() const;
void setTranslation(const Vector3& v); void setTranslation(const Vector3& v);
void setRotation(const Vector3& r); void setRotation(const Vector3& r);
void setPivot(const Vector3& p); void setPivot(const Vector3& p);
void setClippingRegion(const Rect& region); void setClippingRegion(const Rect& region);
void appendVertex(const Vertex& vertex); void appendVertex(const Vertex& vertex);
void appendGeometry(const Vertex* const vbuff, uint vertex_count); void appendGeometry(const Vertex* const vbuff, uint vertex_count);
void setActiveTexture(Texture* texture); void setActiveTexture(Texture* texture);
void reset(); void reset();
 End of changes. 1 change blocks. 
0 lines changed or deleted 7 lines changed or added


 CEGUIIrrlichtTexture.h   CEGUIIrrlichtTexture.h 
skipping to change at line 99 skipping to change at line 99
IrrlichtTexture(IrrlichtRenderer& owner, irr::video::IVideoDriver& driv er); IrrlichtTexture(IrrlichtRenderer& owner, irr::video::IVideoDriver& driv er);
//! Construct a texture from the specified file. //! Construct a texture from the specified file.
IrrlichtTexture(IrrlichtRenderer& owner, irr::video::IVideoDriver& driv er, IrrlichtTexture(IrrlichtRenderer& owner, irr::video::IVideoDriver& driv er,
const String& filename, const String& resourceGroup); const String& filename, const String& resourceGroup);
//! Construct a texture with the given size. //! Construct a texture with the given size.
IrrlichtTexture(IrrlichtRenderer& owner, irr::video::IVideoDriver& driv er, IrrlichtTexture(IrrlichtRenderer& owner, irr::video::IVideoDriver& driv er,
const Size& size); const Size& size);
//! destructor. //! destructor.
~IrrlichtTexture(); ~IrrlichtTexture();
//! create the underlying Irrlicht texture with the given size
void createIrrlichtTexture(const Size& sz);
//! release the underlying irrlicht texture currently used. //! release the underlying irrlicht texture currently used.
void freeIrrlichtTexture(); void freeIrrlichtTexture();
//! updates cached scale value used to map pixels to texture co-ords. //! updates cached scale value used to map pixels to texture co-ords.
void updateCachedScaleValues(); void updateCachedScaleValues();
//! Counter used to provide unique texture names. //! Counter used to provide unique texture names.
static uint32 d_textureNumber; static uint32 d_textureNumber;
//! Irrlicht video driver we're to use. //! Irrlicht video driver we're to use.
irr::video::IVideoDriver& d_driver; irr::video::IVideoDriver& d_driver;
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 CEGUIItemEntry.h   CEGUIItemEntry.h 
skipping to change at line 85 skipping to change at line 85
Fire events on selection / deselection. Fire events on selection / deselection.
(Maybe selectable mode changed as well?) (Maybe selectable mode changed as well?)
*/ */
class CEGUIEXPORT ItemEntry : public Window class CEGUIEXPORT ItemEntry : public Window
{ {
public: public:
/********************************************************************** *** /********************************************************************** ***
Constants Constants
*********************************************************************** **/ *********************************************************************** **/
static const String WidgetTypeName; //!< Window factory nam e static const String WidgetTypeName; //!< Window factory nam e
static const String EventSelectionChanged; //!< Event fired when sel /** Event fired when the item's selection state changes.
ection state changes. * Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ItemEntry whose selection state h
as
* changed.
*/
static const String EventSelectionChanged;
/******************************************************************* ****** /******************************************************************* ******
Accessors Accessors
******************************************************************** *****/ ******************************************************************** *****/
/*! /*!
\brief \brief
Return the "optimal" size for the item Return the "optimal" size for the item
\return \return
Size describing the size in pixel that this ItemEntry's cont ent requires Size describing the size in pixel that this ItemEntry's cont ent requires
 End of changes. 1 change blocks. 
2 lines changed or deleted 7 lines changed or added


 CEGUIItemListBase.h   CEGUIItemListBase.h 
skipping to change at line 101 skipping to change at line 101
UserSort UserSort
}; };
//!< Sorting callback type //!< Sorting callback type
typedef bool (*SortCallback)(const ItemEntry* a, const ItemEntry* b); typedef bool (*SortCallback)(const ItemEntry* a, const ItemEntry* b);
/******************************************************************* ****** /******************************************************************* ******
Constants Constants
******************************************************************** *****/ ******************************************************************** *****/
// event names // event names
static const String EventListContentsChanged; //!< /** Event fired when the contents of the list is changed.
Event triggered when the contents of the list is changed. * Handlers are passed a const WindowEventArgs reference with
static const String EventSortEnabledChanged; //!< Event fired when the * WindowEventArgs::window set to the ItemListBase whose contents
sort enabled state changes. * has changed.
static const String EventSortModeChanged; //!< Event fired when the sor */
t mode changes. static const String EventListContentsChanged;
/** Event fired when the sort enabled state of the list is changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ItemListBase whose sort enabled m
ode
* has been changed.
*/
static const String EventSortEnabledChanged;
/** Event fired when the sort mode of the list is changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ItemListBase whose sorting mode
* has been changed.
*/
static const String EventSortModeChanged;
/******************************************************************* ****** /******************************************************************* ******
Accessor Methods Accessor Methods
******************************************************************** *****/ ******************************************************************** *****/
/*! /*!
\brief \brief
Return number of items attached to the list Return number of items attached to the list
\return \return
the number of items currently attached to this list. the number of items currently attached to this list.
 End of changes. 1 change blocks. 
6 lines changed or deleted 19 lines changed or added


 CEGUIItemListbox.h   CEGUIItemListbox.h 
skipping to change at line 56 skipping to change at line 56
*/ */
class CEGUIEXPORT ItemListbox : public ScrolledItemListBase class CEGUIEXPORT ItemListbox : public ScrolledItemListBase
{ {
public: public:
static const String EventNamespace; //!< Namespace for global events static const String EventNamespace; //!< Namespace for global events
static const String WidgetTypeName; //!< Window factory name static const String WidgetTypeName; //!< Window factory name
/********************************************************************** ** /********************************************************************** **
Constants Constants
*********************************************************************** **/ *********************************************************************** **/
static const String EventSelectionChanged; //!< Event fired when the se /** Event fired when the list selection changes.
lection changes. * Handlers are passed a const WindowEventArgs reference with
static const String EventMultiSelectModeChanged; //!< Event fired when * WindowEventArgs::window set to the ItemListbox whose current selecti
the multiselect mode changes. on
* has been changed.
*/
static const String EventSelectionChanged;
/** Event fired when the multiselect mode of the list box is changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ItemListbox whose multiselect mod
e
* has been changed.
*/
static const String EventMultiSelectModeChanged;
/********************************************************************** ** /********************************************************************** **
Accessors Accessors
*********************************************************************** **/ *********************************************************************** **/
/*! /*!
\brief \brief
Returns the number of selected items in this ItemListbox. Returns the number of selected items in this ItemListbox.
*/ */
size_t getSelectedCount(void) const; size_t getSelectedCount(void) const;
 End of changes. 1 change blocks. 
4 lines changed or deleted 14 lines changed or added


 CEGUIIteratorBase.h   CEGUIIteratorBase.h 
skipping to change at line 215 skipping to change at line 215
{ {
return d_currIter == rhs.d_currIter; return d_currIter == rhs.d_currIter;
} }
/*! /*!
\brief \brief
Compares two iterators. Return true if the current position of the iterators are different. Compares two iterators. Return true if the current position of the iterators are different.
*/ */
bool operator!=(const ConstBaseIterator<T>& rhs) const bool operator!=(const ConstBaseIterator<T>& rhs) const
{ {
return !this == rhs; return !operator==(rhs);
} }
/*! /*!
\brief \brief
Return the value for the current iterator position. Return the value for the current iterator position.
*/ */
mapped_type operator*() const mapped_type operator*() const
{ {
return d_currIter->second; return d_currIter->second;
} }
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 CEGUIListHeader.h   CEGUIListHeader.h 
skipping to change at line 113 skipping to change at line 113
class CEGUIEXPORT ListHeader : public Window class CEGUIEXPORT ListHeader : public Window
{ {
public: public:
static const String EventNamespace; //!< Namespace for global events static const String EventNamespace; //!< Namespace for global events
static const String WidgetTypeName; //!< Window factory nam e static const String WidgetTypeName; //!< Window factory nam e
/******************************************************************* ****** /******************************************************************* ******
Constants Constants
******************************************************************** *****/ ******************************************************************** *****/
// Event names // Event names
static const String EventSortColumnChanged; //!< /** Event fired when the current sort column of the header is changed.
Event fired when the current sort column changes. * Handlers are passed a const WindowEventArgs reference with
static const String EventSortDirectionChanged; //!< Event f * WindowEventArgs::window set to the ListHeader whose sort column has
ired when the sort direction changes. * been changed.
static const String EventSegmentSized; //!< */
Event fired when a segment has been sized by the user (e.window is the seg static const String EventSortColumnChanged;
ment). /** Event fired when the sort direction of the header is changed.
static const String EventSegmentClicked; * Handlers are passed a const WindowEventArgs reference with
//!< Event fired when a segment has been clicked by the user (e.window * WindowEventArgs::window set to the ListHeader whose sort direction h
is the segment). ad
static const String EventSplitterDoubleClicked; //!< Event f * been changed.
ired when a segment splitter has been double-clicked. (e.window is the seg */
ment). static const String EventSortDirectionChanged;
static const String EventSegmentSequenceChanged; //!< /** Event fired when a segment of the header is sized by the user.
Event fired when the order of the segments has changed. ('e' is a HeaderS * Handlers are passed a const WindowEventArgs reference with
equenceEventArgs&) * WindowEventArgs::window set to the ListHeaderSegment that has been s
static const String EventSegmentAdded; //!< ized.
Event fired when a segment is added to the header. */
static const String EventSegmentRemoved; static const String EventSegmentSized;
//!< Event fired when a segment is removed from the header. /** Event fired when a segment of the header is clicked by the user.
static const String EventSortSettingChanged; //!< * Handlers are passed a const WindowEventArgs reference with
Event fired when setting that controls user modification to sort configura * WindowEventArgs::window set to the ListHeaderSegment that was clicke
tion changes. d.
static const String EventDragMoveSettingChanged; //!< */
Event fired when setting that controls user drag & drop of segments change static const String EventSegmentClicked;
s. /** Event fired when a segment splitter of the header is double-clicked
static const String EventDragSizeSettingChanged; //!< .
Event fired when setting that controls user sizing of segments changes. * Handlers are passed a const WindowEventArgs reference with
static const String EventSegmentRenderOffsetChanged; //!< Event f * WindowEventArgs::window set to the ListHeaderSegment whose splitter
ired when the rendering offset for the segments changes. area
* was double-clicked.
*/
static const String EventSplitterDoubleClicked;
/** Event fired when the order of the segments in the header has change
d.
* Handlers are passed a const HeaderSequenceEventArgs reference with
* WindowEventArgs::window set to the ListHeader whose segments have ch
anged
* sequence, HeaderSequenceEventArgs::d_oldIdx is the original index of
the
* segment that has moved, and HeaderSequenceEventArgs::d_newIdx is the
new
* index of the segment that has moved.
*/
static const String EventSegmentSequenceChanged;
/** Event fired when a segment is added to the header.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ListHeader that has had a new seg
ment
* added.
*/
static const String EventSegmentAdded;
/** Event fired when a segment is removed from the header.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ListHeader that has had a segment
* removed.
*/
static const String EventSegmentRemoved;
/** Event fired when setting that controls user modification to sort
* configuration is changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ListHeader whose user sort contro
l
* setting has been changed.
*/
static const String EventSortSettingChanged;
/** Event fired when setting that controls user drag & drop of segments
is
* changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ListHeader whose drag & drop enab
led
* setting has changed.
*/
static const String EventDragMoveSettingChanged;
/** Event fired when setting that controls user sizing of segments is
* changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ListHeader whose user sizing sett
ing
* has changed.
*/
static const String EventDragSizeSettingChanged;
/** Event fired when the rendering offset for the segments changes.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ListHeader whose segment renderin
g
* offset has changed.
*/
static const String EventSegmentRenderOffsetChanged;
// values // values
static const float ScrollSpeed; //!< Speed to scroll at when dragging outside header. static const float ScrollSpeed; //!< Speed to scroll at when dragging outside header.
static const float MinimumSegmentPixelWidth; //!< Miniumu m width of a segment in pixels. static const float MinimumSegmentPixelWidth; //!< Miniumu m width of a segment in pixels.
/********************************************************************** *** /********************************************************************** ***
Child Widget name suffix constants Child Widget name suffix constants
*********************************************************************** **/ *********************************************************************** **/
static const char SegmentNameSuffix[]; //!< Widget name suffix for header segments. static const char SegmentNameSuffix[]; //!< Widget name suffix for header segments.
 End of changes. 1 change blocks. 
30 lines changed or deleted 90 lines changed or added


 CEGUIListHeaderSegment.h   CEGUIListHeaderSegment.h 
skipping to change at line 59 skipping to change at line 59
class CEGUIEXPORT ListHeaderSegment : public Window class CEGUIEXPORT ListHeaderSegment : public Window
{ {
public: public:
static const String EventNamespace; //!< Namespace for global events static const String EventNamespace; //!< Namespace for global events
static const String WidgetTypeName; //!< Window factory nam e static const String WidgetTypeName; //!< Window factory nam e
/******************************************************************* ****** /******************************************************************* ******
Constants Constants
******************************************************************** *****/ ******************************************************************** *****/
// Event names // Event names
static const String EventSegmentClicked; /** Event fired when the segment is clicked.
//!< Event fired when the segment is clicked. * Hanlders are passed a const WindowEventArgs reference with
static const String EventSplitterDoubleClicked; //!< Event f * WindowEventArgs::window set to the ListHeaderSegment that was clicke
ired when the sizer/splitter is double-clicked. d.
static const String EventSizingSettingChanged; //!< Event f */
ired when the sizing setting changes. static const String EventSegmentClicked;
static const String EventSortDirectionChanged; //!< Event f /** Event fired when the sizer/splitter is double-clicked.
ired when the sort direction value changes. * Hanlders are passed a const WindowEventArgs reference with
static const String EventMovableSettingChanged; //!< Event f * WindowEventArgs::window set to the ListHeaderSegment whose
ired when the movable setting changes. * sizer / splitter area was double-clicked.
static const String EventSegmentDragStart; //!< */
Event fired when the segment has started to be dragged. static const String EventSplitterDoubleClicked;
static const String EventSegmentDragStop; /** Event fired when the user drag-sizable setting is changed.
//!< Event fired when segment dragging has stopped (via mouse release). * Hanlders are passed a const WindowEventArgs reference with
static const String EventSegmentDragPositionChanged; //!< Event f * WindowEventArgs::window set to the ListHeaderSegment whose user siza
ired when the segment drag position has changed. ble
static const String EventSegmentSized; //!< * setting has been changed.
Event fired when the segment is sized. */
static const String EventClickableSettingChanged; //!< static const String EventSizingSettingChanged;
Event fired when the clickable state of the segment changes. /** Event fired when the sort direction value is changed.
* Hanlders are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ListHeaderSegment whose sort dire
ction
* has been changed.
*/
static const String EventSortDirectionChanged;
/** Event fired when the user drag-movable setting is changed.
* Hanlders are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ListHeaderSegment whose user
* drag-movable setting has been changed.
*/
static const String EventMovableSettingChanged;
/** Event fired when the segment has started to be dragged.
* Hanlders are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ListHeaderSegment that has starte
d to
* be dragged.
*/
static const String EventSegmentDragStart;
/** Event fired when segment dragging has stopped (via mouse release).
* Hanlders are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ListHeaderSegment that is no long
er
* being dragged.
*/
static const String EventSegmentDragStop;
/** Event fired when the segment drag position has changed.
* Hanlders are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ListHeaderSegment whose position
has
* changed due to being dragged.
*/
static const String EventSegmentDragPositionChanged;
/** Event fired when the segment is sized by the user.
* Hanlders are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ListHeaderSegment that has been
* resized by the user dragging.
*/
static const String EventSegmentSized;
/** Event fired when the clickable setting for the segment is changed.
* Hanlders are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ListHeaderSegment whose setting t
hat
* controls whether the segment is clickable has been changed.
*/
static const String EventClickableSettingChanged;
// Defaults // Defaults
static const float DefaultSizingArea; //!< Default size of the sizing area. static const float DefaultSizingArea; //!< Default size of the sizing area.
static const float SegmentMoveThreshold; //!< Amount the mous e must be dragged before drag-moving is initiated. static const float SegmentMoveThreshold; //!< Amount the mous e must be dragged before drag-moving is initiated.
/******************************************************************* ****** /******************************************************************* ******
Enumerated types Enumerated types
******************************************************************** *****/ ******************************************************************** *****/
/*! /*!
\brief \brief
 End of changes. 1 change blocks. 
20 lines changed or deleted 66 lines changed or added


 CEGUIListbox.h   CEGUIListbox.h 
skipping to change at line 86 skipping to change at line 86
class CEGUIEXPORT Listbox : public Window class CEGUIEXPORT Listbox : public Window
{ {
public: public:
static const String EventNamespace; //!< Namespace for global events static const String EventNamespace; //!< Namespace for global events
static const String WidgetTypeName; //!< Window factory nam e static const String WidgetTypeName; //!< Window factory nam e
/******************************************************************* ****** /******************************************************************* ******
Constants Constants
******************************************************************** *****/ ******************************************************************** *****/
// event names // event names
static const String EventListContentsChanged; //!< /** Event fired when the contents of the list is changed.
Event triggered when the contents of the list is changed. * Handlers are passed a const WindowEventArgs reference with
static const String EventSelectionChanged; //!< * WindowEventArgs::window set to the Listbox whose content is changed.
Event triggered when there is a change to the currently selected item(s). */
static const String EventSortModeChanged; static const String EventListContentsChanged;
//!< Event triggered when the sort mode setting changes. /** Event fired when there is a change to the currently selected item(s
static const String EventMultiselectModeChanged; //!< )
Event triggered when the multi-select mode setting changes. * within the list.
static const String EventVertScrollbarModeChanged; //!< Event t * Handlers are passed a const WindowEventArgs reference with
riggered when the vertical scroll bar 'force' setting changes. * WindowEventArgs::window set to the Litbox that has had a change in t
static const String EventHorzScrollbarModeChanged; //!< Event t he
riggered when the horizontal scroll bar 'force' setting changes. * selected items.
*/
static const String EventSelectionChanged;
/** Event fired when the sort mode setting changes for the Listbox.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Listbox whose sort mode has been
* changed.
*/
static const String EventSortModeChanged;
/** Event fired when the multi-select mode setting changes for the List
box.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Listbox whose multi-select mode h
as
* been changed.
*/
static const String EventMultiselectModeChanged;
/** Event fired when the mode setting that forces the display of the
* vertical scroll bar for the Listbox is changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Listbox whose vertical
* scrollbar mode has been changed.
*/
static const String EventVertScrollbarModeChanged;
/** Event fired when the mode setting that forces the display of the
* horizontal scroll bar for the Listbox is changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Listbox whose horizontal
* scrollbar mode has been changed.
*/
static const String EventHorzScrollbarModeChanged;
/********************************************************************** *** /********************************************************************** ***
Child Widget name suffix constants Child Widget name suffix constants
*********************************************************************** **/ *********************************************************************** **/
static const String VertScrollbarNameSuffix; //!< Widget name suffix for the vertical scrollbar component. static const String VertScrollbarNameSuffix; //!< Widget name suffix for the vertical scrollbar component.
static const String HorzScrollbarNameSuffix; //!< Widget name suffix for the horizontal scrollbar component. static const String HorzScrollbarNameSuffix; //!< Widget name suffix for the horizontal scrollbar component.
/******************************************************************* ****** /******************************************************************* ******
Accessor Methods Accessor Methods
******************************************************************** *****/ ******************************************************************** *****/
skipping to change at line 523 skipping to change at line 555
Return the sum of all item heights Return the sum of all item heights
*/ */
float getTotalItemsHeight(void) const; float getTotalItemsHeight(void) const;
/*! /*!
\brief \brief
Return the width of the widest item Return the width of the widest item
*/ */
float getWidestItemWidth(void) const; float getWidestItemWidth(void) const;
/*!
\brief
Return a pointer to the ListboxItem attached to this Listbox
at the
given screen pixel co-ordinate.
\return
Pointer to the ListboxItem attached to this Listbox that is
at screen
position \a pt, or 0 if no ListboxItem attached to this Listbox is
at
that position.
*/
ListboxItem* getItemAtPoint(const Point& pt) const;
/******************************************************************* ****** /******************************************************************* ******
Construction and Destruction Construction and Destruction
******************************************************************** *****/ ******************************************************************** *****/
/*! /*!
\brief \brief
Constructor for Listbox base class. Constructor for Listbox base class.
*/ */
Listbox(const String& type, const String& name); Listbox(const String& type, const String& name);
/*! /*!
skipping to change at line 580 skipping to change at line 624
\brief \brief
Clear the selected state for all items (implementation) Clear the selected state for all items (implementation)
\return \return
true if some selections were cleared, false nothing was chan ged. true if some selections were cleared, false nothing was chan ged.
*/ */
bool clearAllSelections_impl(void); bool clearAllSelections_impl(void);
/*! /*!
\brief \brief
Return the ListboxItem under the given window local pixel co
-ordinate.
\return
ListboxItem that is under window pixel co-ordinate \a pt, or
NULL if no
item is under that position.
*/
ListboxItem* getItemAtPoint(const Point& pt) const;
/*!
\brief
Remove all items from the list. Remove all items from the list.
\note \note
Note that this will cause 'AutoDelete' items to be deleted. Note that this will cause 'AutoDelete' items to be deleted.
\return \return
- true if the list contents were changed. - true if the list contents were changed.
- false if the list contents were not changed (list already empty). - false if the list contents were not changed (list already empty).
*/ */
bool resetList_impl(void); bool resetList_impl(void);
 End of changes. 3 change blocks. 
24 lines changed or deleted 57 lines changed or added


 CEGUIListboxItem.h   CEGUIListboxItem.h 
skipping to change at line 71 skipping to change at line 71
/*! /*!
\brief \brief
base class constructor base class constructor
*/ */
ListboxItem(const String& text, uint item_id = 0, void* item_data = 0, bool disabled = false, bool auto_delete = true); ListboxItem(const String& text, uint item_id = 0, void* item_data = 0, bool disabled = false, bool auto_delete = true);
/*! /*!
\brief \brief
base class destructor base class destructor
*/ */
virtual ~ListboxItem(void) {} virtual ~ListboxItem(void);
/********************************************************************** *** /********************************************************************** ***
Accessors Accessors
*********************************************************************** **/ *********************************************************************** **/
/*! /*!
\brief \brief
return the text string set for this list box item. return the text string set for this list box item.
Note that even if the item does not render text, the text string ca n still be useful, since it Note that even if the item does not render text, the text string ca n still be useful, since it
is used for sorting list box items. is used for sorting list box items.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 CEGUIListboxTextItem.h   CEGUIListboxTextItem.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 _CEGUIListboxTextItem_h_ #ifndef _CEGUIListboxTextItem_h_
#define _CEGUIListboxTextItem_h_ #define _CEGUIListboxTextItem_h_
#include "CEGUIListboxItem.h" #include "CEGUIListboxItem.h"
#include "../CEGUIBasicRenderedStringParser.h" #include "../CEGUIBasicRenderedStringParser.h"
#include "../CEGUIDefaultRenderedStringParser.h"
// Start of CEGUI namespace section // Start of CEGUI namespace section
namespace CEGUI namespace CEGUI
{ {
/*! /*!
\brief \brief
Class used for textual items in a list box. Class used for textual items in a list box.
*/ */
class CEGUIEXPORT ListboxTextItem : public ListboxItem class CEGUIEXPORT ListboxTextItem : public ListboxItem
{ {
skipping to change at line 161 skipping to change at line 162
Set the colours used for text rendering. Set the colours used for text rendering.
\param col \param col
colour value to be used when rendering. colour value to be used when rendering.
\return \return
Nothing. Nothing.
*/ */
void setTextColours(colour col) {setTextColours(col, col, col, col);} void setTextColours(colour col) {setTextColours(col, col, col, col);}
/*!
\brief
Set whether the the ListboxTextItem will have it's text parsed via
the
BasicRenderedStringParser or not.
\param enable
- true if the ListboxTextItem text will be parsed.
- false if the ListboxTextItem text will be used verbatim.
*/
void setTextParsingEnabled(const bool enable);
//! return whether text parsing is enabled for this ListboxTextItem.
bool isTextParsingEnabled() const;
// base class overrides // base class overrides
void setText(const String& text); void setText(const String& text);
/******************************************************************* ****** /******************************************************************* ******
Required implementations of pure virtuals from the base clas s. Required implementations of pure virtuals from the base clas s.
******************************************************************** *****/ ******************************************************************** *****/
Size getPixelSize(void) const; Size getPixelSize(void) const;
void draw(GeometryBuffer& buffer, const Rect& targetRect, float alpha, const Rect* clipper) const; void draw(GeometryBuffer& buffer, const Rect& targetRect, float alpha, const Rect* clipper) const;
protected: protected:
skipping to change at line 184 skipping to change at line 199
Implementation Data Implementation Data
******************************************************************** *****/ ******************************************************************** *****/
ColourRect d_textCols; //!< Colours used fo r rendering the text. ColourRect d_textCols; //!< Colours used fo r rendering the text.
Font* d_font; //!< Font used for r endering text. Font* d_font; //!< Font used for r endering text.
//! Parser used to produce a final RenderedString from the standard Str ing. //! Parser used to produce a final RenderedString from the standard Str ing.
static BasicRenderedStringParser d_stringParser; static BasicRenderedStringParser d_stringParser;
//! RenderedString drawn by this item. //! RenderedString drawn by this item.
mutable RenderedString d_renderedString; mutable RenderedString d_renderedString;
//! boolean used to track when item state changes (and needs re-parse) //! boolean used to track when item state changes (and needs re-parse)
mutable bool d_renderedStringValid; mutable bool d_renderedStringValid;
//! Parser used when parsing is off. Basically just does linebreaks.
static DefaultRenderedStringParser d_noTagsStringParser;
//! boolean that specifies whether text parsing is enabled for the item
.
bool d_textParsingEnabled;
}; };
} // End of CEGUI namespace section } // End of CEGUI namespace section
#endif // end of guard _CEGUIListboxTextItem_h_ #endif // end of guard _CEGUIListboxTextItem_h_
 End of changes. 3 change blocks. 
0 lines changed or deleted 21 lines changed or added


 CEGUIMenuBase.h   CEGUIMenuBase.h 
skipping to change at line 60 skipping to change at line 60
*/ */
class CEGUIEXPORT MenuBase : public ItemListBase class CEGUIEXPORT MenuBase : public ItemListBase
{ {
public: public:
static const String EventNamespace; //!< Namespace for global events static const String EventNamespace; //!< Namespace for global events
/******************************************************************* ****** /******************************************************************* ******
Event name constants Event name constants
******************************************************************** *****/ ******************************************************************** *****/
// generated internally by Window // generated internally by Window
static const String EventPopupOpened; /** Event fired when a MenuItem attached to this menu opened a PopupMen
//!< A MenuItem attached to this menu opened a PopupMenu u.
static const String EventPopupClosed; * Handlers are passed a const WindowEventArgs reference with
//!< A MenuItem attached to this menu opened a PopupMenu * WindowEventArgs::window set to the PopupMenu that was opened.
*/
static const String EventPopupOpened;
/** Event fired when a MenuItem attached to this menu closed a PopupMen
u.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the PopupMenu that was closed.
*/
static const String EventPopupClosed;
/******************************************************************* ****** /******************************************************************* ******
Accessor type functions Accessor type functions
******************************************************************** *****/ ******************************************************************** *****/
/*! /*!
\brief \brief
Get the item spacing for this menu. Get the item spacing for this menu.
\return \return
A float value with the current item spacing for this menu A float value with the current item spacing for this menu
 End of changes. 1 change blocks. 
4 lines changed or deleted 12 lines changed or added


 CEGUIMenuItem.h   CEGUIMenuItem.h 
skipping to change at line 55 skipping to change at line 55
class CEGUIEXPORT MenuItem : public ItemEntry class CEGUIEXPORT MenuItem : public ItemEntry
{ {
public: public:
static const String EventNamespace; //!< Namespace for global events static const String EventNamespace; //!< Namespace for global events
static const String WidgetTypeName; //!< Window factory nam e static const String WidgetTypeName; //!< Window factory nam e
/******************************************************************* ****** /******************************************************************* ******
Event name constants Event name constants
******************************************************************** *****/ ******************************************************************** *****/
// generated internally by Window // generated internally by Window
static const String EventClicked; /** Event fired when the menu item is clicked.
//!< The menu item was clicked. * Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the MenuItem that was clicked.
*/
static const String EventClicked;
/******************************************************************* ****** /******************************************************************* ******
Accessor type functions Accessor type functions
******************************************************************** *****/ ******************************************************************** *****/
/*! /*!
\brief \brief
return true if user is hovering over this widget (or it's pu shed and user is not over it for highlight) return true if user is hovering over this widget (or it's pu shed and user is not over it for highlight)
\return \return
true if the user is hovering or if the button is pushed and the mouse is not over the button. Otherwise return false. true if the user is hovering or if the button is pushed and the mouse is not over the button. Otherwise return false.
 End of changes. 1 change blocks. 
2 lines changed or deleted 5 lines changed or added


 CEGUIMouseCursor.h   CEGUIMouseCursor.h 
skipping to change at line 76 skipping to change at line 76
*/ */
class CEGUIEXPORT MouseCursor : public EventSet, public Singleton<MouseCurs or> class CEGUIEXPORT MouseCursor : public EventSet, public Singleton<MouseCurs or>
{ {
public: public:
static const String EventNamespace; //!< Namespace for global events static const String EventNamespace; //!< Namespace for global events
/******************************************************************* ****** /******************************************************************* ******
Event name constants Event name constants
******************************************************************** *****/ ******************************************************************** *****/
// generated internally by MouseCursor // generated internally by MouseCursor
static const String EventImageChanged; //!< The cur /** Event fired when the mouse cursor image is changed.
sor image of the widget has changed. * Handlers are passed a const MouseCursorEventArgs reference with
* MouseCursorEventArgs::mouseCursor set to the MouseCursor that has
* had it's image changed, and MouseCursorEventArgs::image set to the
* Image that is now set for the MouseCursor (may be 0).
*/
static const String EventImageChanged;
/*! /*!
\brief \brief
Constructor for MouseCursor objects Constructor for MouseCursor objects
*/ */
MouseCursor(void); MouseCursor(void);
/*! /*!
\brief \brief
Destructor for MouseCursor objects Destructor for MouseCursor objects
skipping to change at line 288 skipping to change at line 294
You normally would not call this directly; rather you would call th e You normally would not call this directly; rather you would call th e
function System::notifyDisplaySizeChanged and that will then call t his function System::notifyDisplaySizeChanged and that will then call t his
function for you. function for you.
\param new_size \param new_size
Size object describing the new display size in pixels. Size object describing the new display size in pixels.
*/ */
void notifyDisplaySizeChanged(const Size& new_size); void notifyDisplaySizeChanged(const Size& new_size);
/*!
\brief
Set an explicit size for the mouse cursor image to be drawn at.
This will override the size that is usually obtained directly from
the
mouse cursor image and will stay in effect across changes to the mo
use
cursor image.
Setting this size to (0, 0) will revert back to using the size as
obtained from the Image itself.
\param size
Reference to a Size object that describes the size at which the cur
sor
image should be drawn in pixels.
*/
void setExplicitRenderSize(const Size& size);
/*!
\brief
Return the explicit render size currently set. A return size of (0
, 0)
indicates that the real image size will be used.
*/
const Size& getExplicitRenderSize() const;
/*!
\brief
Static function to pre-initialise the mouse cursor position (prior
to
MouseCursor instantiation).
Calling this function prior to instantiating MouseCursor will preve
nt
the mouse having it's position set to the middle of the initial vie
w.
Calling this function after the MouseCursor is instantiated will ha
ve
no effect.
\param position
Reference to a point object describing the initial pixel position t
o
be used for the mouse cursor.
*/
static void setInitialMousePosition(const Point& position);
/*!
\brief
Mark the cached geometry as invalid so it will be recached next tim
e the
mouse cursor is drawn.
*/
void invalidate();
protected: protected:
/******************************************************************* ****** /******************************************************************* ******
New event handlers New event handlers
******************************************************************** *****/ ******************************************************************** *****/
/*! /*!
\brief \brief
event triggered internally when image of mouse cursor change s event triggered internally when image of mouse cursor change s
*/ */
virtual void onImageChanged(MouseCursorEventArgs& e); virtual void onImageChanged(MouseCursorEventArgs& e);
private: private:
/******************************************************************* ****** /******************************************************************* ******
Implementation Methods Implementation Methods
******************************************************************** *****/ ******************************************************************** *****/
/*! /*!
\brief \brief
Checks the mouse cursor position is within the current 'cons train' Rect and adjusts as required. Checks the mouse cursor position is within the current 'cons train' Rect and adjusts as required.
*/ */
void constrainPosition(void); void constrainPosition(void);
//! updates the cached geometry.
void cacheGeometry() const;
//! calculate offset for custom image size so 'hot spot' is maintained.
void calculateCustomOffset() const;
/******************************************************************* ****** /******************************************************************* ******
Implementation Data Implementation Data
******************************************************************** *****/ ******************************************************************** *****/
const Image* d_cursorImage; //!< Image that is currently set as the mouse cursor. const Image* d_cursorImage; //!< Image that is currently set as the mouse cursor.
Vector2 d_position; //!< Current location of the cursor Vector2 d_position; //!< Current location of the cursor
bool d_visible; //!< true if the cursor will be drawn, else false. bool d_visible; //!< true if the cursor will be drawn, else false.
URect d_constraints; //!< Specifies the a rea (in screen pixels) that the mouse can move around in. URect d_constraints; //!< Specifies the a rea (in screen pixels) that the mouse can move around in.
//! buffer to hold geometry for mouse cursor imagery. //! buffer to hold geometry for mouse cursor imagery.
GeometryBuffer* d_geometry; GeometryBuffer* d_geometry;
//! custom explicit size to render the cursor image at
Size d_customSize;
//! correctly scaled offset used when using custom image size.
mutable Point d_customOffset;
//! true if the mouse initial position has been pre-set
static bool s_initialPositionSet;
//! value set as initial position (if any)
static Point s_initialPosition;
//! boolean indicating whether cached pointer geometry is valid.
mutable bool d_cachedGeometryValid;
}; };
} // 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 _CEGUIMouseCursor_h_ #endif // end of guard _CEGUIMouseCursor_h_
 End of changes. 4 change blocks. 
2 lines changed or deleted 80 lines changed or added


 CEGUIMultiColumnList.h   CEGUIMultiColumnList.h 
skipping to change at line 107 skipping to change at line 107
class CEGUIEXPORT MultiColumnList : public Window class CEGUIEXPORT MultiColumnList : public Window
{ {
public: public:
static const String EventNamespace; //!< Namespace for global events static const String EventNamespace; //!< Namespace for global events
static const String WidgetTypeName; //!< Window factory nam e static const String WidgetTypeName; //!< Window factory nam e
/******************************************************************* ****** /******************************************************************* ******
Constants Constants
******************************************************************** *****/ ******************************************************************** *****/
// Event names // Event names
static const String EventSelectionModeChanged; //!< Event f /** Event fired when the selection mode for the list box changes.
ired when the selection mode for the list box changes. * Handlers are passed a const WindowEventArgs reference with
static const String EventNominatedSelectColumnChanged;//!< Event fir * WindowEventArgs::window set to the MultiColumnList whose selection m
ed when the nominated select column changes. ode
static const String EventNominatedSelectRowChanged; //!< Event f * has been changed.
ired when the nominated select row changes. */
static const String EventVertScrollbarModeChanged; //!< Event f static const String EventSelectionModeChanged;
ired when the vertical scroll bar 'force' setting changes. /** Event fired when the nominated select column changes.
static const String EventHorzScrollbarModeChanged; //!< Event f * Handlers are passed a const WindowEventArgs reference with
ired when the horizontal scroll bar 'force' setting changes. * WindowEventArgs::window set to the MultiColumnList whose nominated
static const String EventSelectionChanged; //!< * selection column has been changed.
Event fired when the current selection(s) within the list box changes. */
static const String EventListContentsChanged; //!< static const String EventNominatedSelectColumnChanged;
Event fired when the contents of the list box changes. /** Event fired when the nominated select row changes.
static const String EventSortColumnChanged; //!< * Handlers are passed a const WindowEventArgs reference with
Event fired when the sort column changes. * WindowEventArgs::window set to the MultiColumnList whose nominated
static const String EventSortDirectionChanged; //!< Event f * selection row has been changed.
ired when the sort direction changes. */
static const String EventListColumnSized; static const String EventNominatedSelectRowChanged;
//!< Event fired when the width of a column in the list changes. /** Event fired when the vertical scroll bar 'force' setting changes.
static const String EventListColumnMoved; * Handlers are passed a const WindowEventArgs reference with
//!< Event fired when the column order changes. * WindowEventArgs::window set to the MultiColumnList whose vertical sc
roll
* bar mode has been changed.
*/
static const String EventVertScrollbarModeChanged;
/** Event fired when the horizontal scroll bar 'force' setting changes.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the MultiColumnList whose horizontal
* scroll bar mode has been changed.
*/
static const String EventHorzScrollbarModeChanged;
/** Event fired when the current selection(s) within the list box chang
es.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the MultiColumnList whose current
* selection has changed.
*/
static const String EventSelectionChanged;
/** Event fired when the contents of the list box changes.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the MultiColumnList whose contents ha
s
* changed.
*/
static const String EventListContentsChanged;
/** Event fired when the sort column changes.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the MultiColumnList whose sort column
has
* been changed.
*/
static const String EventSortColumnChanged;
/** Event fired when the sort direction changes.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the MultiColumnList whose sort direct
ion
* has been changed.
*/
static const String EventSortDirectionChanged;
/** Event fired when the width of a column in the list changes.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the MultiColumnList for which a colum
n
* width has changed.
*/
static const String EventListColumnSized;
/** Event fired when the column order changes.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the MultiColumnList for which the ord
er
* of columns has been changed.
*/
static const String EventListColumnMoved;
/********************************************************************** *** /********************************************************************** ***
Child Widget name suffix constants Child Widget name suffix constants
*********************************************************************** **/ *********************************************************************** **/
static const String VertScrollbarNameSuffix; //!< Widget name suffix for the vertical scrollbar component. static const String VertScrollbarNameSuffix; //!< Widget name suffix for the vertical scrollbar component.
static const String HorzScrollbarNameSuffix; //!< Widget name suffix for the horizontal scrollbar component. static const String HorzScrollbarNameSuffix; //!< Widget name suffix for the horizontal scrollbar component.
static const String ListHeaderNameSuffix; //!< Widget name suffix for the list header component. static const String ListHeaderNameSuffix; //!< Widget name suffix for the list header component.
/******************************************************************* ****** /******************************************************************* ******
Enumerations Enumerations
 End of changes. 1 change blocks. 
22 lines changed or deleted 74 lines changed or added


 CEGUIMultiLineEditbox.h   CEGUIMultiLineEditbox.h 
skipping to change at line 90 skipping to change at line 90
class CEGUIEXPORT MultiLineEditbox : public Window class CEGUIEXPORT MultiLineEditbox : public Window
{ {
public: public:
static const String EventNamespace; //!< Namespace for global events static const String EventNamespace; //!< Namespace for global events
static const String WidgetTypeName; //!< Window factory nam e static const String WidgetTypeName; //!< Window factory nam e
/******************************************************************* ****** /******************************************************************* ******
Constants Constants
******************************************************************** *****/ ******************************************************************** *****/
// event names // event names
static const String EventReadOnlyModeChanged; //!< /** Event fired when the read-only mode for the edit box has been chang
The read-only mode for the edit box has been changed. ed.
static const String EventWordWrapModeChanged; //!< * Handlers are passed a const WindowEventArgs reference with
The word wrap mode of the text box has been changed. * WindowEventArgs::window set to the MultiLineEditbox whose read-only
static const String EventMaximumTextLengthChanged; //!< The max mode
imum allowable string length has been changed. * was changed.
static const String EventCaratMoved; */
//!< The text carat (insert point) has changed. static const String EventReadOnlyModeChanged;
static const String EventTextSelectionChanged; //!< The cur /** Event fired when the word wrap mode of the edit box has been change
rent text selection has changed. d.
static const String EventEditboxFull; * Handlers are passed a const WindowEventArgs reference with
//!< The number of characters in the edit box has reached the current m * WindowEventArgs::window set to the MultiLineEditbox whose word wrap
aximum. * mode was changed.
static const String EventVertScrollbarModeChanged; //!< Event t */
riggered when the vertical scroll bar 'force' setting changes. static const String EventWordWrapModeChanged;
static const String EventHorzScrollbarModeChanged; //!< Event t /** Event fired when the maximum allowable string length for the edit b
riggered when the horizontal scroll bar 'force' setting changes. ox
* has been changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the MultiLineEditbox whose maximum st
ring
* length was changed.
*/
static const String EventMaximumTextLengthChanged;
/** Event fired when the text caret / current insertion position is cha
nged.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the MultiLineEditbox whose caret posi
tion
* has changed.
*/
static const String EventCaratMoved;
/** Event fired when the current text selection for the edit box is cha
nged.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the MultiLineEditbox whose text selec
tion
* was changed.
*/
static const String EventTextSelectionChanged;
/** Event fired when the number of characters in the edit box reaches t
he
* current maximum length.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the MultiLineEditbox whose text lengt
h
* has reached the set maximum allowable length for the edit box.
*/
static const String EventEditboxFull;
/** Event fired when the mode setting that forces the display of the
* vertical scroll bar for the edit box is changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the MultiLineEditbox whose vertical
* scrollbar mode has been changed.
*/
static const String EventVertScrollbarModeChanged;
/** Event fired when the mode setting that forces the display of the
* horizontal scroll bar for the edit box is changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the MultiLineEditbox whose horizontal
* scrollbar mode has been changed.
*/
static const String EventHorzScrollbarModeChanged;
/********************************************************************** *** /********************************************************************** ***
Child Widget name suffix constants Child Widget name suffix constants
*********************************************************************** **/ *********************************************************************** **/
static const String VertScrollbarNameSuffix; //!< Widget name suffix for the vertical scrollbar component. static const String VertScrollbarNameSuffix; //!< Widget name suffix for the vertical scrollbar component.
static const String HorzScrollbarNameSuffix; //!< Widget name suffix for the horizontal scrollbar component. static const String HorzScrollbarNameSuffix; //!< Widget name suffix for the horizontal scrollbar component.
/********************************************************************** *** /********************************************************************** ***
Implementation struct Implementation struct
*********************************************************************** **/ *********************************************************************** **/
skipping to change at line 398 skipping to change at line 442
Rect object describing the area of the Window to be used for rendering text. Rect object describing the area of the Window to be used for rendering text.
*/ */
//virtual Rect getTextRenderArea_impl(void) const = 0; //virtual Rect getTextRenderArea_impl(void) const = 0;
/******************************************************************* ****** /******************************************************************* ******
Implementation Methods Implementation Methods
******************************************************************** *****/ ******************************************************************** *****/
/*! /*!
\brief \brief
Format the text into lines as needed by the current formatti ng options. Format the text into lines as needed by the current formatti ng options.
\deprecated
This is deprecated in favour of the version taking a boolean.
*/ */
void formatText(void); void formatText(void);
/*!
\brief
Format the text into lines as dictated by the formatting options.
\param update_scrollbars
- true if scrollbar configuration should be performed.
- false if scrollbar configuration should not be performed.
*/
void formatText(const bool update_scrollbars);
/*! /*!
\brief \brief
Return the length of the next token in String \a text starti ng at index \a start_idx. Return the length of the next token in String \a text starti ng at index \a start_idx.
\note \note
Any single whitespace character is one token, any group of o ther characters is a token. Any single whitespace character is one token, any group of o ther characters is a token.
\return \return
The code point length of the token. The code point length of the token.
*/ */
skipping to change at line 563 skipping to change at line 619
return Window::testClassName_impl(class_name); return Window::testClassName_impl(class_name);
} }
/*! /*!
\brief \brief
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);
// handler triggered when vertical scrollbar is shown or hidden
bool handle_vertScrollbarVisibilityChanged(const EventArgs&);
// validate window renderer // validate window renderer
virtual bool validateWindowRenderer(const String& name) const virtual bool validateWindowRenderer(const String& name) const
{ {
return (name == EventNamespace); return (name == EventNamespace);
} }
/******************************************************************* ****** /******************************************************************* ******
New event handlers New event handlers
******************************************************************** *****/ ******************************************************************** *****/
/*! /*!
 End of changes. 4 change blocks. 
17 lines changed or deleted 78 lines changed or added


 CEGUINamedXMLResourceManager.h   CEGUINamedXMLResourceManager.h 
skipping to change at line 61 skipping to change at line 61
}; };
//------------------------------------------------------------------------- ---// //------------------------------------------------------------------------- ---//
//! implementation class to gather EventSet parts for all template instance s. //! implementation class to gather EventSet parts for all template instance s.
class CEGUIEXPORT ResourceEventSet : public EventSet class CEGUIEXPORT ResourceEventSet : public EventSet
{ {
public: public:
//! Namespace name for all resource managers //! Namespace name for all resource managers
static const String EventNamespace; static const String EventNamespace;
//! Name of event fired when a resource is created by this manager. /** Name of event fired when a resource is created by this manager.
* Handlers are passed a const ResourceEventArgs reference with
* ResourceEventArgs::resourceType String set to the type of resource t
hat
* the event is related to, and ResourceEventArgs::resourceName String
set
* to the name of the resource that the event is related to.
*/
static const String EventResourceCreated; static const String EventResourceCreated;
//! Name of event fired when a resource is destroyed by this manager. /** Name of event fired when a resource is destroyed by this manager.
* Handlers are passed a const ResourceEventArgs reference with
* ResourceEventArgs::resourceType String set to the type of resource t
hat
* the event is related to, and ResourceEventArgs::resourceName String
set
* to the name of the resource that the event is related to.
*/
static const String EventResourceDestroyed; static const String EventResourceDestroyed;
//! Name of event fired when a resource is replaced by this manager. /** Name of event fired when a resource is replaced by this manager.
* Handlers are passed a const ResourceEventArgs reference with
* ResourceEventArgs::resourceType String set to the type of resource t
hat
* the event is related to, and ResourceEventArgs::resourceName String
set
* to the name of the resource that the event is related to.
*/
static const String EventResourceReplaced; static const String EventResourceReplaced;
}; };
//------------------------------------------------------------------------- ---// //------------------------------------------------------------------------- ---//
/*! /*!
\brief \brief
Templatised manager class that loads and manages named XML based resour ces. Templatised manager class that loads and manages named XML based resour ces.
\tparam T \tparam T
skipping to change at line 262 skipping to change at line 277
destroyObject(d_objects.begin()); destroyObject(d_objects.begin());
} }
//------------------------------------------------------------------------- ---// //------------------------------------------------------------------------- ---//
template<typename T, typename U> template<typename T, typename U>
T& NamedXMLResourceManager<T, U>::get(const String& object_name) const T& NamedXMLResourceManager<T, U>::get(const String& object_name) const
{ {
typename ObjectRegistry::const_iterator i(d_objects.find(object_name)); typename ObjectRegistry::const_iterator i(d_objects.find(object_name));
if (i == d_objects.end()) if (i == d_objects.end())
throw UnknownObjectException("NamedXMLResourceManager::get: " CEGUI_THROW(UnknownObjectException("NamedXMLResourceManager::get: "
"No object of type '" + d_resourceType + "' named '" + object_n ame + "No object of type '" + d_resourceType + "' named '" + object_n ame +
"' is present in the collection."); "' is present in the collection."));
return *i->second; return *i->second;
} }
//------------------------------------------------------------------------- ---// //------------------------------------------------------------------------- ---//
template<typename T, typename U> template<typename T, typename U>
bool NamedXMLResourceManager<T, U>::isDefined(const String& object_name) co nst bool NamedXMLResourceManager<T, U>::isDefined(const String& object_name) co nst
{ {
return d_objects.find(object_name) != d_objects.end(); return d_objects.find(object_name) != d_objects.end();
} }
skipping to change at line 328 skipping to change at line 343
case XREA_REPLACE: case XREA_REPLACE:
Logger::getSingleton().logEvent("---- Replacing existing instan ce " Logger::getSingleton().logEvent("---- Replacing existing instan ce "
"of " + d_resourceType + " named '" + object_name + "of " + d_resourceType + " named '" + object_name +
"' (DANGER!)."); "' (DANGER!).");
destroy(object_name); destroy(object_name);
event_name = EventResourceReplaced; event_name = EventResourceReplaced;
break; break;
case XREA_THROW: case XREA_THROW:
delete object; delete object;
throw AlreadyExistsException( CEGUI_THROW(AlreadyExistsException(
"NamedXMLResourceManager::checkExistingObjectAction: " "NamedXMLResourceManager::checkExistingObjectAction: "
"an object of type '" + d_resourceType + "' named '" + "an object of type '" + d_resourceType + "' named '" +
object_name + "' already exists in the collection."); object_name + "' already exists in the collection."));
default: default:
delete object; delete object;
throw InvalidRequestException( CEGUI_THROW(InvalidRequestException(
"NamedXMLResourceManager::checkExistingObjectAction: " "NamedXMLResourceManager::checkExistingObjectAction: "
"Invalid CEGUI::XMLResourceExistsAction was specified."); "Invalid CEGUI::XMLResourceExistsAction was specified."));
} }
} }
else else
event_name = EventResourceCreated; event_name = EventResourceCreated;
d_objects[object_name] = object; d_objects[object_name] = object;
doPostObjectAdditionAction(*object); doPostObjectAdditionAction(*object);
// fire event about this resource change // fire event about this resource change
ResourceEventArgs args(d_resourceType, object_name); ResourceEventArgs args(d_resourceType, object_name);
 End of changes. 9 change blocks. 
9 lines changed or deleted 30 lines changed or added


 CEGUIOpenGLGeometryBuffer.h   CEGUIOpenGLGeometryBuffer.h 
/*********************************************************************** /***********************************************************************
filename: CEGUIOpenGLGeometryBuffer.h filename: CEGUIOpenGLGeometryBuffer.h
created: Thu Jan 8 2009 created: Thu Jan 8 2009
author: Paul D Turner author: Paul D Turner
*************************************************************************/ *************************************************************************/
/************************************************************************** * /************************************************************************** *
* Copyright (C) 2004 - 2009 Paul D Turner & The CEGUI Development Team * Copyright (C) 2004 - 2010 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 56 skipping to change at line 56
class OpenGLTexture; class OpenGLTexture;
/*! /*!
\brief \brief
OpenGL based implementation of the GeometryBuffer interface. OpenGL based implementation of the GeometryBuffer interface.
*/ */
class OPENGL_GUIRENDERER_API OpenGLGeometryBuffer : public GeometryBuffer class OPENGL_GUIRENDERER_API OpenGLGeometryBuffer : public GeometryBuffer
{ {
public: public:
//! Constructor //! Constructor
OpenGLGeometryBuffer(); OpenGLGeometryBuffer(OpenGLRenderer& owner);
// implementation of abstract members from GeometryBuffer // implementation of abstract members from GeometryBuffer
void draw() const; void draw() const;
void setTranslation(const Vector3& t); void setTranslation(const Vector3& t);
void setRotation(const Vector3& r); void setRotation(const Vector3& r);
void setPivot(const Vector3& p); void setPivot(const Vector3& p);
void setClippingRegion(const Rect& region); void setClippingRegion(const Rect& region);
void appendVertex(const Vertex& vertex); void appendVertex(const Vertex& vertex);
void appendGeometry(const Vertex* const vbuff, uint vertex_count); void appendGeometry(const Vertex* const vbuff, uint vertex_count);
void setActiveTexture(Texture* texture); void setActiveTexture(Texture* texture);
skipping to change at line 92 skipping to change at line 92
void updateMatrix() const; void updateMatrix() const;
//! internal Vertex structure used for GL based geometry. //! internal Vertex structure used for GL based geometry.
struct GLVertex struct GLVertex
{ {
float tex[2]; float tex[2];
float colour[4]; float colour[4];
float position[3]; float position[3];
}; };
//! OpenGLRenderer object that owns the GeometryBuffer.
OpenGLRenderer* d_owner;
//! last texture that was set as active //! last texture that was set as active
OpenGLTexture* d_activeTexture; OpenGLTexture* d_activeTexture;
//! type to track info for per-texture sub batches of geometry //! type to track info for per-texture sub batches of geometry
typedef std::pair<uint, uint> BatchInfo; typedef std::pair<uint, uint> BatchInfo;
//! type of container that tracks BatchInfos. //! type of container that tracks BatchInfos.
typedef std::vector<BatchInfo> BatchList; typedef std::vector<BatchInfo> BatchList;
//! list of texture batches added to the geometry buffer //! list of texture batches added to the geometry buffer
BatchList d_batches; BatchList d_batches;
//! type of container used to queue the geometry //! type of container used to queue the geometry
typedef std::vector<GLVertex> VertexList; typedef std::vector<GLVertex> VertexList;
 End of changes. 3 change blocks. 
2 lines changed or deleted 4 lines changed or added


 CEGUIOpenGLRenderer.h   CEGUIOpenGLRenderer.h 
/*********************************************************************** /***********************************************************************
filename: CEGUIOpenGLRenderer.h filename: CEGUIOpenGLRenderer.h
created: Sun Jan 11 2009 created: Sun Jan 11 2009
author: Paul D Turner author: Paul D Turner
*************************************************************************/ *************************************************************************/
/************************************************************************** * /************************************************************************** *
* Copyright (C) 2004 - 2009 Paul D Turner & The CEGUI Development Team * Copyright (C) 2004 - 2010 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 83 skipping to change at line 83
//! Use targets based on frame buffer objects if available, else no ne. //! Use targets based on frame buffer objects if available, else no ne.
TTT_FBO, TTT_FBO,
//! Use targets based on pbuffer support if available, else none. //! Use targets based on pbuffer support if available, else none.
TTT_PBUFFER, TTT_PBUFFER,
//! Disable texture targets. //! Disable texture targets.
TTT_NONE TTT_NONE
}; };
/*! /*!
\brief \brief
Convenience function that creates the required objects to initialis
e the
CEGUI system.
The created Renderer will use the current OpenGL viewport as it's
default surface size.
This will create and initialise the following objects for you:
- CEGUI::OpenGLRenderer
- CEGUI::DefaultResourceProvider
- CEGUI::System
\param tt_type
Specifies one of the TextureTargetType enumerated values indicating
the
desired TextureTarget type to be used. Defaults to TTT_AUTO.
\return
Reference to the CEGUI::OpenGLRenderer object that was created.
*/
static OpenGLRenderer& bootstrapSystem(
const TextureTargetType tt_type = TTT_A
UTO);
/*!
\brief
Convenience function that creates the required objects to initialis
e the
CEGUI system.
The created Renderer will use the current OpenGL viewport as it's
default surface size.
This will create and initialise the following objects for you:
- CEGUI::OpenGLRenderer
- CEGUI::DefaultResourceProvider
- CEGUI::System
\param display_size
Size object describing the initial display resolution.
\param tt_type
Specifies one of the TextureTargetType enumerated values indicating
the
desired TextureTarget type to be used. Defaults to TTT_AUTO.
\return
Reference to the CEGUI::OpenGLRenderer object that was created.
*/
static OpenGLRenderer& bootstrapSystem(const Size& display_size,
const TextureTargetType tt_type = TTT_AUT
O);
/*!
\brief
Convenience function to cleanup the CEGUI system and related object
s
that were created by calling the bootstrapSystem function.
This function will destroy the following objects for you:
- CEGUI::System
- CEGUI::DefaultResourceProvider
- CEGUI::OpenGLRenderer
\note
If you did not initialise CEGUI by calling the bootstrapSystem func
tion,
you should \e not call this, but rather delete any objects you crea
ted
manually.
*/
static void destroySystem();
/*!
\brief
Create an OpenGLRenderer object. Create an OpenGLRenderer object.
\param tt_type \param tt_type
Specifies one of the TextureTargetType enumerated values indicating the Specifies one of the TextureTargetType enumerated values indicating the
desired TextureTarget type to be used. desired TextureTarget type to be used.
*/ */
static OpenGLRenderer& create(const TextureTargetType tt_type = TTT_AUT O); static OpenGLRenderer& create(const TextureTargetType tt_type = TTT_AUT O);
/*! /*!
\brief \brief
skipping to change at line 200 skipping to change at line 266
*/ */
Size getAdjustedTextureSize(const Size& sz) const; Size getAdjustedTextureSize(const Size& sz) const;
/*! /*!
\brief \brief
Utility function that will return \a f if it's a power of two, or t he Utility function that will return \a f if it's a power of two, or t he
next power of two up from \a f if it's not. next power of two up from \a f if it's not.
*/ */
static float getNextPOTSize(const float f); static float getNextPOTSize(const float f);
//! set the render states for the specified BlendMode.
void setupRenderingBlendMode(const BlendMode mode, const bool force = f
alse);
private: private:
/*! /*!
\brief \brief
Constructor for OpenGL Renderer objects Constructor for OpenGL Renderer objects
\param tt_type \param tt_type
Specifies one of the TextureTargetType enumerated values indicating the Specifies one of the TextureTargetType enumerated values indicating the
desired TextureTarget type to be used. desired TextureTarget type to be used.
*/ */
OpenGLRenderer(const TextureTargetType tt_type); OpenGLRenderer(const TextureTargetType tt_type);
skipping to change at line 267 skipping to change at line 336
//! container type used to hold Textures we create. //! container type used to hold Textures we create.
typedef std::vector<OpenGLTexture*> TextureList; typedef std::vector<OpenGLTexture*> TextureList;
//! Container used to track textures. //! Container used to track textures.
TextureList d_textures; TextureList d_textures;
//! What the renderer thinks the max texture size is. //! What the renderer thinks the max texture size is.
uint d_maxTextureSize; uint d_maxTextureSize;
//! option of whether to initialise extra states that may not be at def ault //! option of whether to initialise extra states that may not be at def ault
bool d_initExtraStates; bool d_initExtraStates;
//! pointer to a helper that creates TextureTargets supported by the sy stem. //! pointer to a helper that creates TextureTargets supported by the sy stem.
OGLTextureTargetFactory* d_textureTargetFactory; OGLTextureTargetFactory* d_textureTargetFactory;
//! What blend mode we think is active.
BlendMode d_activeBlendMode;
}; };
} // 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 _CEGUIOpenGLRenderer_h_ #endif // end of guard _CEGUIOpenGLRenderer_h_
 End of changes. 4 change blocks. 
1 lines changed or deleted 82 lines changed or added


 CEGUIProgressBar.h   CEGUIProgressBar.h 
skipping to change at line 58 skipping to change at line 58
*/ */
class CEGUIEXPORT ProgressBar : public Window class CEGUIEXPORT ProgressBar : public Window
{ {
public: public:
static const String EventNamespace; //!< Namespace for global events static const String EventNamespace; //!< Namespace for global events
static const String WidgetTypeName; //!< Window factory nam e static const String WidgetTypeName; //!< Window factory nam e
/******************************************************************* ****** /******************************************************************* ******
Event name constants Event name constants
******************************************************************** *****/ ******************************************************************** *****/
static const String EventProgressChanged; //!< Event f /** Event fired whenever the progress value is changed.
ired whenever the progress value changes. * Handlers are passed a const WindowEventArgs reference with
static const String EventProgressDone; //!< Event fired whe * WindowEventArgs::window set to the ProgressBar whose value has been
n the progress bar reaches 100%. * changed.
*/
static const String EventProgressChanged;
/** Event fired when the progress bar's value reaches 100%.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ProgressBar whose progress value
* has reached 100%.
*/
static const String EventProgressDone;
/******************************************************************* ***** /******************************************************************* *****
Accessor Functions Accessor Functions
******************************************************************** ****/ ******************************************************************** ****/
/*! /*!
\brief \brief
return the current progress value return the current progress value
*/ */
float getProgress(void) const {return d_progress;} float getProgress(void) const {return d_progress;}
 End of changes. 1 change blocks. 
4 lines changed or deleted 12 lines changed or added


 CEGUIPropertyHelper.h   CEGUIPropertyHelper.h 
skipping to change at line 59 skipping to change at line 59
static Size stringToSize(const String& str); static Size stringToSize(const String& str);
static Point stringToPoint(const String& str); static Point stringToPoint(const String& str);
static Vector3 stringToVector3(const String& str); static Vector3 stringToVector3(const String& str);
static Rect stringToRect(const String& str); static Rect stringToRect(const String& str);
static const Image* stringToImage(const String& str); static const Image* stringToImage(const String& str);
static colour stringToColour(const String& str); static colour stringToColour(const String& str);
static ColourRect stringToColourRect(const String& str); static ColourRect stringToColourRect(const String& str);
static UDim stringToUDim(const String& str); static UDim stringToUDim(const String& str);
static UVector2 stringToUVector2(const String& str); static UVector2 stringToUVector2(const String& str);
static URect stringToURect(const String& str); static URect stringToURect(const String& str);
static UBox stringToUBox(const String& str);
static String floatToString(float val); static String floatToString(float val);
static String uintToString(uint val); static String uintToString(uint val);
static String intToString(int val); static String intToString(int val);
static String boolToString(bool val); static String boolToString(bool val);
static String sizeToString(const Size& val); static String sizeToString(const Size& val);
static String pointToString(const Point& val); static String pointToString(const Point& val);
static String vector3ToString(const Vector3& val); static String vector3ToString(const Vector3& val);
static String rectToString(const Rect& val); static String rectToString(const Rect& val);
static String imageToString(const Image* const val); static String imageToString(const Image* const val);
static String colourToString(const colour& val); static String colourToString(const colour& val);
static String colourRectToString(const ColourRect& val); static String colourRectToString(const ColourRect& val);
static String udimToString(const UDim& val); static String udimToString(const UDim& val);
static String uvector2ToString(const UVector2& val); static String uvector2ToString(const UVector2& val);
static String urectToString(const URect& val); static String urectToString(const URect& val);
static String uboxToString(const UBox& val);
}; };
} // End of CEGUI namespace section } // End of CEGUI namespace section
#endif // end of guard _CEGUIPropertyHelper_h_ #endif // end of guard _CEGUIPropertyHelper_h_
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 CEGUIPushButton.h   CEGUIPushButton.h 
skipping to change at line 58 skipping to change at line 58
class CEGUIEXPORT PushButton : public ButtonBase class CEGUIEXPORT PushButton : public ButtonBase
{ {
public: public:
static const String EventNamespace; //!< Namespace for global events static const String EventNamespace; //!< Namespace for global events
static const String WidgetTypeName; //!< Window factory nam e static const String WidgetTypeName; //!< Window factory nam e
/******************************************************************* ****** /******************************************************************* ******
Event name constants Event name constants
******************************************************************** *****/ ******************************************************************** *****/
// generated internally by Window // generated internally by Window
static const String EventClicked; /** Event fired when the button is clicked.
//!< The button was clicked. * Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the PushButton that was clicked.
*/
static const String EventClicked;
/******************************************************************* ****** /******************************************************************* ******
Construction and Destruction Construction and Destruction
******************************************************************** *****/ ******************************************************************** *****/
/*! /*!
\brief \brief
Constructor for base PushButton class Constructor for base PushButton class
*/ */
PushButton(const String& type, const String& name); PushButton(const String& type, const String& name);
 End of changes. 1 change blocks. 
2 lines changed or deleted 5 lines changed or added


 CEGUIRadioButton.h   CEGUIRadioButton.h 
skipping to change at line 60 skipping to change at line 60
class CEGUIEXPORT RadioButton : public ButtonBase class CEGUIEXPORT RadioButton : public ButtonBase
{ {
public: public:
static const String EventNamespace; //!< Namespace for global events static const String EventNamespace; //!< Namespace for global events
static const String WidgetTypeName; //!< Window factory nam e static const String WidgetTypeName; //!< Window factory nam e
/******************************************************************* ****** /******************************************************************* ******
Event name constants Event name constants
******************************************************************** *****/ ******************************************************************** *****/
// generated internally by Window // generated internally by Window
static const String EventSelectStateChanged; //!< /** Event fired when the selected state of the radio button changes.
The selected state of the widget has changed. * Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the RadioButton whose selected state
has
* changed.
*/
static const String EventSelectStateChanged;
/******************************************************************* ****** /******************************************************************* ******
Accessor Functions Accessor Functions
******************************************************************** *****/ ******************************************************************** *****/
/*! /*!
\brief \brief
return true if the radio button is selected (has the checkma rk) return true if the radio button is selected (has the checkma rk)
\return \return
true if this widget is selected, false if the widget is not selected. true if this widget is selected, false if the widget is not selected.
 End of changes. 1 change blocks. 
2 lines changed or deleted 7 lines changed or added


 CEGUIRect.h   CEGUIRect.h 
skipping to change at line 193 skipping to change at line 193
return ((d_left == rhs.d_left) && (d_right == rhs.d_right) & & (d_top == rhs.d_top) && (d_bottom == rhs.d_bottom)); return ((d_left == rhs.d_left) && (d_right == rhs.d_right) & & (d_top == rhs.d_top) && (d_bottom == rhs.d_bottom));
} }
bool operator!=(const Rect& rhs) const {return !ope rator==(rhs);} bool operator!=(const Rect& rhs) const {return !ope rator==(rhs);}
Rect& operator=(const Rect& rhs); Rect& operator=(const Rect& rhs);
Rect operator*(float scalar) const { return Rect(d_left * scalar, d_top * scalar, d_right * scalar, d_bottom * scalar); } Rect operator*(float scalar) const { return Rect(d_left * scalar, d_top * scalar, d_right * scalar, d_bottom * scalar); }
const Rect& operator*=(float scalar) { d_left *= scalar; d_top *= sc alar; d_right *= scalar; d_bottom *= scalar; return *this; } const Rect& operator*=(float scalar) { d_left *= scalar; d_top *= sc alar; d_right *= scalar; d_bottom *= scalar; return *this; }
Rect operator+(const Rect& r) const { return Rect(d_left
+ r.d_left, d_top + r.d_top, d_right + r.d_right, d_bottom + r.d_bottom);
}
/******************************************************************* ****** /******************************************************************* ******
Data Fields Data Fields
******************************************************************** *****/ ******************************************************************** *****/
float d_top, d_bottom, d_left, d_right; float d_left, d_top, d_right, d_bottom;
}; };
} // End of CEGUI namespace section } // End of CEGUI namespace section
#endif // end of guard _CEGUIRect_h_ #endif // end of guard _CEGUIRect_h_
 End of changes. 2 change blocks. 
1 lines changed or deleted 5 lines changed or added


 CEGUIRefCounted.h   CEGUIRefCounted.h 
skipping to change at line 40 skipping to change at line 40
// Start of CEGUI namespace section // Start of CEGUI namespace section
namespace CEGUI namespace CEGUI
{ {
/*! /*!
\brief \brief
Simple, generic, reference counted pointer class. This is primarily he re Simple, generic, reference counted pointer class. This is primarily he re
for use by the Events system to track when to delete slot bindings. for use by the Events system to track when to delete slot bindings.
*/ */
template<typename T> template<typename T>
class CEGUIEXPORT RefCounted class RefCounted
{ {
public: public:
/*! /*!
\brief \brief
Default constructor. Default constructor.
*/ */
RefCounted() : RefCounted() :
d_object(0), d_object(0),
d_count(0) d_count(0)
{ {
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 CEGUIRenderer.h   CEGUIRenderer.h 
skipping to change at line 56 skipping to change at line 56
//! Diagonal split goes from top-left to bottom-right //! Diagonal split goes from top-left to bottom-right
TopLeftToBottomRight, TopLeftToBottomRight,
//! Diagonal split goes from bottom-left to top-right //! Diagonal split goes from bottom-left to top-right
BottomLeftToTopRight BottomLeftToTopRight
}; };
//------------------------------------------------------------------------- ---// //------------------------------------------------------------------------- ---//
/*! /*!
\brief \brief
Enumerated type that contains the valid options that specify the type o
f
blending that is to be performed for subsequent rendering operations.
*/
enum BlendMode
{
//! Invalid mode indicator.
BM_INVALID,
//! Use normal blending mode.
BM_NORMAL,
//! Use blending mode suitable for textures with premultiplied colours.
BM_RTT_PREMULTIPLIED
};
//-------------------------------------------------------------------------
---//
/*!
\brief
Abstract class defining the basic required interface for Renderer objec ts. Abstract class defining the basic required interface for Renderer objec ts.
Objects derived from Renderer are the means by which the GUI system Objects derived from Renderer are the means by which the GUI system
interfaces with specific rendering technologies. To use a rendering sy stem interfaces with specific rendering technologies. To use a rendering sy stem
or API to draw CEGUI imagery requires that an appropriate Renderer obje ct be or API to draw CEGUI imagery requires that an appropriate Renderer obje ct be
available. available.
*/ */
class CEGUIEXPORT Renderer class CEGUIEXPORT Renderer
{ {
public: public:
 End of changes. 1 change blocks. 
0 lines changed or deleted 19 lines changed or added


 CEGUIRenderingSurface.h   CEGUIRenderingSurface.h 
skipping to change at line 113 skipping to change at line 113
\note \note
For performance reasons, events are only fired for queues that are in u se; For performance reasons, events are only fired for queues that are in u se;
these are queues that have had some interaction - such as clearing or a dding these are queues that have had some interaction - such as clearing or a dding
geometry. geometry.
*/ */
class CEGUIEXPORT RenderingSurface : public EventSet class CEGUIEXPORT RenderingSurface : public EventSet
{ {
public: public:
//! Namespace for global events from RenderingSurface objects. //! Namespace for global events from RenderingSurface objects.
static const String EventNamespace; static const String EventNamespace;
//! Event that signals the start of rendering for a queue. /** Event fired when rendering of a RenderQueue begins for the
* RenderingSurface.
* Handlers are passed a const RenderQueueEventArgs reference with
* RenderQueueEventArgs::queueID set to one of the ::RenderQueueID
* enumerated values indicating the queue that is about to start
* rendering.
*/
static const String EventRenderQueueStarted; static const String EventRenderQueueStarted;
//! Event that signals the end of rendering for a queue. /** Event fired when rendering of a RenderQueue completes for the
* RenderingSurface.
* Handlers are passed a const RenderQueueEventArgs reference with
* RenderQueueEventArgs::queueID set to one of the ::RenderQueueID
* enumerated values indicating the queue that has completed rendering.
*/
static const String EventRenderQueueEnded; static const String EventRenderQueueEnded;
/*! /*!
\brief \brief
Constructor for RenderingSurface objects. Constructor for RenderingSurface objects.
\param target \param target
RenderTarget object that will receive rendered output from the RenderTarget object that will receive rendered output from the
RenderingSurface being created. RenderingSurface being created.
 End of changes. 2 change blocks. 
2 lines changed or deleted 13 lines changed or added


 CEGUIRenderingWindow.h   CEGUIRenderingWindow.h 
skipping to change at line 247 skipping to change at line 247
\note \note
In normal usage you should never have to call this directly. There may In normal usage you should never have to call this directly. There may
be certain cases where it might be useful to call this when using t he be certain cases where it might be useful to call this when using t he
RenderEffect system. RenderEffect system.
*/ */
void realiseGeometry(); void realiseGeometry();
/*! /*!
\brief \brief
Mark the geometry used when rendering the RenderingWindow back to i
t's
owning RenderingSurface as invalid so that it gets regenerated on t
he
next rendering pass.
This is separate from the main invalidate() function because in mos
t
cases invalidating the cached imagery will not require the potentia
lly
expensive regeneration of the geometry for the RenderingWindow itse
lf.
*/
void invalidateGeometry();
/*!
\brief
Return the RenderingSurface that owns the RenderingWindow. This is Return the RenderingSurface that owns the RenderingWindow. This is
also the RenderingSurface that will be used when the RenderingWindo w also the RenderingSurface that will be used when the RenderingWindo w
renders back it's cached imagery content. renders back it's cached imagery content.
\return \return
RenderingSurface object that owns, and is targetted by, the RenderingSurface object that owns, and is targetted by, the
RenderingWindow. RenderingWindow.
*/ */
const RenderingSurface& getOwner() const; const RenderingSurface& getOwner() const;
RenderingSurface& getOwner(); RenderingSurface& getOwner();
 End of changes. 1 change blocks. 
0 lines changed or deleted 17 lines changed or added


 CEGUIScheme.h   CEGUIScheme.h 
skipping to change at line 330 skipping to change at line 330
String aliasName; String aliasName;
String targetName; String targetName;
}; };
struct FalagardMapping struct FalagardMapping
{ {
String windowName; String windowName;
String targetName; String targetName;
String rendererName; String rendererName;
String lookName; String lookName;
String effectName;
}; };
/******************************************************************* ****** /******************************************************************* ******
Implementation Data Implementation Data
******************************************************************** *****/ ******************************************************************** *****/
String d_name; //!< the name of this scheme. String d_name; //!< the name of this scheme.
std::vector<LoadableUIElement> d_imagesets; std::vector<LoadableUIElement> d_imagesets;
std::vector<LoadableUIElement> d_imagesetsFromImages; std::vector<LoadableUIElement> d_imagesetsFromImages;
std::vector<LoadableUIElement> d_fonts; std::vector<LoadableUIElement> d_fonts;
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 CEGUIScheme_xmlHandler.h   CEGUIScheme_xmlHandler.h 
skipping to change at line 100 skipping to change at line 100
//! Attribute specifying the base type of a falagard mapped window type . //! Attribute specifying the base type of a falagard mapped window type .
static const String TargetTypeAttribute; static const String TargetTypeAttribute;
//! Attribute specifying the name of a LookNFeel for a falagard mapping . //! Attribute specifying the name of a LookNFeel for a falagard mapping .
static const String LookNFeelAttribute; static const String LookNFeelAttribute;
//! Element specifying a module and set of WindowRendererFactory elemen ts. //! Element specifying a module and set of WindowRendererFactory elemen ts.
static const String WindowRendererSetElement; static const String WindowRendererSetElement;
//! Element specifying a WindowRendererFactory type. //! Element specifying a WindowRendererFactory type.
static const String WindowRendererFactoryElement; static const String WindowRendererFactoryElement;
//! Attribute specifying the type name of a window renderer. //! Attribute specifying the type name of a window renderer.
static const String WindowRendererAttribute; static const String WindowRendererAttribute;
//! Attribute specifying the name of a registered RenderEffect.
static const String RenderEffectAttribute;
//! Function that handles the opening GUIScheme XML element. //! Function that handles the opening GUIScheme XML element.
void elementGUISchemeStart(const XMLAttributes& attributes); void elementGUISchemeStart(const XMLAttributes& attributes);
//! Function that handles the Imageset XML element. //! Function that handles the Imageset XML element.
void elementImagesetStart(const XMLAttributes& attributes); void elementImagesetStart(const XMLAttributes& attributes);
//! Function that handles the ImagesetFromImage XML element. //! Function that handles the ImagesetFromImage XML element.
void elementImagesetFromImageStart(const XMLAttributes& attributes); void elementImagesetFromImageStart(const XMLAttributes& attributes);
//! Function that handles the Font XML element. //! Function that handles the Font XML element.
void elementFontStart(const XMLAttributes& attributes); void elementFontStart(const XMLAttributes& attributes);
//! Function that handles the WindowSet XML element. //! Function that handles the WindowSet XML element.
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 CEGUIScrollablePane.h   CEGUIScrollablePane.h 
skipping to change at line 76 skipping to change at line 76
area larger than the ScrollablePane itself and these child windows can be area larger than the ScrollablePane itself and these child windows can be
scrolled into view using the scrollbars of the scrollable pane. scrolled into view using the scrollbars of the scrollable pane.
*/ */
class CEGUIEXPORT ScrollablePane : public Window class CEGUIEXPORT ScrollablePane : public Window
{ {
public: public:
//! Window factory name //! Window factory name
static const String WidgetTypeName; static const String WidgetTypeName;
//! Namespace for global events //! Namespace for global events
static const String EventNamespace; static const String EventNamespace;
//! Event fired when an area on the content pane has been updated. /** Event fired when an area on the content pane has been updated.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ScrollablePane whose content pane
* has been updated.
*/
static const String EventContentPaneChanged; static const String EventContentPaneChanged;
//! Event triggered when the vertical scroll bar 'force' setting change /** Event fired when the vertical scroll bar 'force' setting is changed
s. .
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ScrollablePane whose vertical scr
oll
* bar mode has been changed.
*/
static const String EventVertScrollbarModeChanged; static const String EventVertScrollbarModeChanged;
//! Event triggered when the horizontal scroll bar 'force' setting chan /** Event fired when the horizontal scroll bar 'force' setting is chang
ges. ed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ScrollablePane whose horizontal s
croll
* bar mode has been changed.
*/
static const String EventHorzScrollbarModeChanged; static const String EventHorzScrollbarModeChanged;
//! Event fired when the auto size setting changes. /** Event fired when the auto size setting for the pane is changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ScrollablePane whose auto size
* setting has been changed.
*/
static const String EventAutoSizeSettingChanged; static const String EventAutoSizeSettingChanged;
//! Event fired when the pane gets scrolled. /** Event fired when the pane gets scrolled.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ScrollablePane that has been scro
lled.
*/
static const String EventContentPaneScrolled; static const String EventContentPaneScrolled;
//! Widget name suffix for the vertical scrollbar component. //! Widget name suffix for the vertical scrollbar component.
static const String VertScrollbarNameSuffix; static const String VertScrollbarNameSuffix;
//! Widget name suffix for the horizontal scrollbar component. //! Widget name suffix for the horizontal scrollbar component.
static const String HorzScrollbarNameSuffix; static const String HorzScrollbarNameSuffix;
//! Widget name suffix for the scrolled container component. //! Widget name suffix for the scrolled container component.
static const String ScrolledContainerNameSuffix; static const String ScrolledContainerNameSuffix;
//! Constructor for the ScrollablePane base class. //! Constructor for the ScrollablePane base class.
ScrollablePane(const String& type, const String& name); ScrollablePane(const String& type, const String& name);
 End of changes. 5 change blocks. 
7 lines changed or deleted 29 lines changed or added


 CEGUIScrollbar.h   CEGUIScrollbar.h 
/*********************************************************************** /***********************************************************************
filename: CEGUIScrollbar.h filename: CEGUIScrollbar.h
created: 13/4/2004 created: 13/4/2004
author: Paul D Turner author: Paul D Turner
purpose: Interface to base class for Scrollbar widget
*************************************************************************/ *************************************************************************/
/************************************************************************** * /************************************************************************** *
* Copyright (C) 2004 - 2006 Paul D Turner & The CEGUI Development Team * Copyright (C) 2004 - 2010 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 38 skipping to change at line 36
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
************************************************************************** */ ************************************************************************** */
#ifndef _CEGUIScrollbar_h_ #ifndef _CEGUIScrollbar_h_
#define _CEGUIScrollbar_h_ #define _CEGUIScrollbar_h_
#include "../CEGUIBase.h" #include "../CEGUIBase.h"
#include "../CEGUIWindow.h" #include "../CEGUIWindow.h"
#include "CEGUIScrollbarProperties.h" #include "CEGUIScrollbarProperties.h"
#if defined(_MSC_VER) #if defined(_MSC_VER)
# pragma warning(push) # pragma warning(push)
# pragma warning(disable : 4251) # pragma warning(disable : 4251)
#endif #endif
// Start of CEGUI namespace section // Start of CEGUI namespace section
namespace CEGUI namespace CEGUI
{ {
/*! /*!
\brief \brief
Base class for ItemEntry window renderer objects. Base class for Scrollbar window renderer objects.
*/ */
class CEGUIEXPORT ScrollbarWindowRenderer : public WindowRenderer class CEGUIEXPORT ScrollbarWindowRenderer : public WindowRenderer
{ {
public: public:
/*! /*!
\brief \brief
Constructor Constructor
*/ */
ScrollbarWindowRenderer(const String& name); ScrollbarWindowRenderer(const String& name);
/*! /*!
\brief \brief
update the size and location of the thumb to properly represent the update the size and location of the thumb to properly represent the
current state of the scroll bar current state of the scroll bar
*/ */
virtual void updateThumb(void) = 0; virtual void updateThumb(void) = 0;
/*! /*!
\brief \brief
return value that best represents current scroll bar position given return value that best represents current scroll bar position given
the current location of the thumb. the
current location of the thumb.
\return \return
float value that, given the thumb widget position, best represents float value that, given the thumb widget position, best represents
the current position for the scroll bar. the
current position for the scroll bar.
*/ */
virtual float getValueFromThumb(void) const = 0; virtual float getValueFromThumb(void) const = 0;
/*! /*!
\brief \brief
Given window location \a pt, return a value indicating what change Given window location \a pt, return a value indicating what change
should be should be made to the scroll bar.
made to the scroll bar.
\param pt \param pt
Point object describing a pixel position in window space. Point object describing a pixel position in window space.
\return \return
- -1 to indicate scroll bar position should be moved to a lower val ue. - -1 to indicate scroll bar position should be moved to a lower val ue.
- 0 to indicate scroll bar position should not be changed. - 0 to indicate scroll bar position should not be changed.
- +1 to indicate scroll bar position should be moved to a higher va lue. - +1 to indicate scroll bar position should be moved to a higher va lue.
*/ */
virtual float getAdjustDirectionFromPoint(const Point& pt) const = 0 ; virtual float getAdjustDirectionFromPoint(const Point& pt) const = 0;
}; };
/*! /*!
\brief \brief
Base scroll bar class. Base scroll bar class.
This base class for scroll bars does not have any idea of direction This base class for scroll bars does not have any idea of direction - a
- a derived class would derived class would add whatever meaning is appropriate according to wh
add whatever meaning is appropriate according to what that derived c at
lass that derived class represents to the user.
represents to the user.
*/ */
class CEGUIEXPORT Scrollbar : public Window class CEGUIEXPORT Scrollbar : public Window
{ {
public: public:
static const String EventNamespace; //!< //! Namespace for global events
Namespace for global events static const String EventNamespace;
static const String WidgetTypeName; //!< Window factory nam //! Window factory name
e static const String WidgetTypeName;
/******************************************************************* /**********************************************************************
****** ***
Event name constants Event name constants
******************************************************************** ***********************************************************************
*****/ **/
static const String EventScrollPositionChanged; //!< Name of /** Event fired when the scroll bar position value changes.
the event fired when the scroll bar position value changes * Handlers are passed a const WindowEventArgs reference with
static const String EventThumbTrackStarted; //!< * WindowEventArgs::window set to the Scrollbar whose position value ha
Name of the event fired when the user begins dragging the thumb. d
static const String EventThumbTrackEnded; * changed.
//!< Name of the event fired when the user releases the thumb. */
static const String EventScrollConfigChanged; //!< static const String EventScrollPositionChanged;
Name of the event fired when the scroll bar configuration data changes. /** Event fired when the user begins dragging the scrollbar thumb.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Scrollbar whose thumb is being
* dragged.
*/
static const String EventThumbTrackStarted;
/** Event fired when the user releases the scrollbar thumb.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Scrollbar whose thumb has been
* released.
*/
static const String EventThumbTrackEnded;
/** Event fired when the scroll bar configuration data is changed.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the Scrollbar whose configuration
* has been changed.
*/
static const String EventScrollConfigChanged;
/********************************************************************** *** /********************************************************************** ***
Child Widget name suffix constants Child Widget name suffix constants
*********************************************************************** **/ *********************************************************************** **/
static const String ThumbNameSuffix; //!< Widget name suffix //! Widget name suffix for the thumb component.
for the thumb component. static const String ThumbNameSuffix;
static const String IncreaseButtonNameSuffix; //!< Widget name suffix //! Widget name suffix for the increase button component.
for the increase button component. static const String IncreaseButtonNameSuffix;
static const String DecreaseButtonNameSuffix; //!< Widget name suffix //! Widget name suffix for the decrease button component.
for the decrease button component. static const String DecreaseButtonNameSuffix;
/******************************************************************* /**********************************************************************
****** ***
Accessor functions Accessor functions
******************************************************************** ***********************************************************************
*****/ **/
/*! /*!
\brief \brief
Return the size of the document or data. Return the size of the document or data.
The document size should be thought of as the total size of The document size should be thought of as the total size of the dat
the data that a
is being scrolled through (the number of lines in a text fil that is being scrolled through (the number of lines in a text file
e for example). for
example).
\note \note
The returned value has no meaning within the Gui system, it The returned value has no meaning within the Gui system, it is left
is left up to the up
application to assign appropriate values for the application to the application to assign appropriate values for the application
specific use of specific use of the scroll bar.
the scroll bar.
\return \return
float value specifying the currently set document size. float value specifying the currently set document size.
*/ */
float getDocumentSize(void) const {return d_do float getDocumentSize(void) const
cumentSize;} {
return d_documentSize;
}
/*! /*!
\brief \brief
Return the page size for this scroll bar. Return the page size for this scroll bar.
The page size is typically the amount of data that can be di The page size is typically the amount of data that can be displayed
splayed at one at
time. This value is also used when calculating the amount t one time. This value is also used when calculating the amount the
he position will position will change when you click either side of the scroll bar
change when you click either side of the scroll bar thumb - thumb, the amount the position changes will is (pageSize - overlapS
the amount the ize).
position changes will is (pageSize - overlapSize).
\note \note
The returned value has no meaning within the Gui system, it The returned value has no meaning within the Gui system, it is left
is left up to the up
application to assign appropriate values for the application to the application to assign appropriate values for the application
specific use of specific use of the scroll bar.
the scroll bar.
\return \return
float value specifying the currently set page size. float value specifying the currently set page size.
*/ */
float getPageSize(void) const {return d_pa float getPageSize(void) const
geSize;} {
return d_pageSize;
}
/*! /*!
\brief \brief
Return the step size for this scroll bar. Return the step size for this scroll bar.
The step size is typically a single unit of data that can be The step size is typically a single unit of data that can be displa
displayed, this is the yed,
amount the position will change when you click either of the this is the amount the position will change when you click either o
arrow buttons on the f
scroll bar. (this could be 1 for a single line of text, for the arrow buttons on the scroll bar. (this could be 1 for a single
example). line of text, for example).
\note \note
The returned value has no meaning within the Gui system, it The returned value has no meaning within the Gui system, it is left
is left up to the up
application to assign appropriate values for the application to the application to assign appropriate values for the application
specific use of specific use of the scroll bar.
the scroll bar.
\return \return
float value specifying the currently set step size. float value specifying the currently set step size.
*/ */
float getStepSize(void) const {return d_st float getStepSize(void) const
epSize;} {
return d_stepSize;
}
/*! /*!
\brief \brief
Return the overlap size for this scroll bar. Return the overlap size for this scroll bar.
The overlap size is the amount of data from the end of a 'pa The overlap size is the amount of data from the end of a 'page' tha
ge' that will t
remain visible when the position is moved by a page. This i will remain visible when the position is moved by a page. This is
s usually used usually used so that the user keeps some context of where they were
so that the user keeps some context of where they were withi within the document's data when jumping a page at a time.
n the document's
data when jumping a page at a time.
\note \note
The returned value has no meaning within the Gui system, it The returned value has no meaning within the Gui system, it is left
is left up to the up
application to assign appropriate values for the application to the application to assign appropriate values for the application
specific use of specific use of the scroll bar.
the scroll bar.
\return \return
float value specifying the currently set overlap size. float value specifying the currently set overlap size.
*/ */
float getOverlapSize(void) const {return d_ov float getOverlapSize(void) const
erlapSize;} {
return d_overlapSize;
}
/*! /*!
\brief \brief
Return the current position of scroll bar within the documen Return the current position of scroll bar within the document.
t.
The range of the scroll bar is from 0 to the size of the doc The range of the scroll bar is from 0 to the size of the document m
ument minus the inus
size of a page (0 <= position <= (documentSize - pageSize)). the size of a page (0 <= position <= (documentSize - pageSize)).
\note \note
The returned value has no meaning within the Gui system, it The returned value has no meaning within the Gui system, it is left
is left up to the up
application to assign appropriate values for the application to the application to assign appropriate values for the application
specific use of specific use of the scroll bar.
the scroll bar.
\return \return
float value specifying the current position of the scroll ba float value specifying the current position of the scroll bar withi
r within its n its
document. document.
*/ */
float getScrollPosition(void) const {return d_position;} float getScrollPosition(void) const
{
return d_position;
}
/*! /*!
\brief \brief
Return a pointer to the 'increase' PushButtoncomponent widget for t his Return a pointer to the 'increase' PushButtoncomponent widget for t his
Scrollbar. Scrollbar.
\return \return
Pointer to a PushButton object. Pointer to a PushButton object.
\exception UnknownObjectException \exception UnknownObjectException
skipping to change at line 250 skipping to change at line 293
Return a pointer to the Thumb component widget for this Scrollbar. Return a pointer to the Thumb component widget for this Scrollbar.
\return \return
Pointer to a Thumb object. Pointer to a Thumb object.
\exception UnknownObjectException \exception UnknownObjectException
Thrown if the Thumb component does not exist. Thrown if the Thumb component does not exist.
*/ */
Thumb* getThumb() const; Thumb* getThumb() const;
/******************************************************************* /**********************************************************************
****** ***
Manipulator Commands Manipulator Commands
******************************************************************** ***********************************************************************
*****/ **/
/*! /*!
\brief \brief
Initialises the Scrollbar object ready for use. Initialises the Scrollbar object ready for use.
\note \note
This must be called for every window created. Normally this This must be called for every window created. Normally this is han
is handled automatically by the WindowFactory for each Window type. dled
automatically by the WindowFactory for each Window type.
\return \return
Nothing Nothing
*/ */
virtual void initialiseComponents(void); virtual void initialiseComponents(void);
/*! /*!
\brief \brief
Set the size of the document or data. Set the size of the document or data.
The document size should be thought of as the total size of The document size should be thought of as the total size of the dat
the data that a
is being scrolled through (the number of lines in a text fil that is being scrolled through (the number of lines in a text file
e for example). for
example).
\note \note
The value set has no meaning within the Gui system, it is le The value set has no meaning within the Gui system, it is left up t
ft up to the o
application to assign appropriate values for the application the application to assign appropriate values for the application
specific use of specific use of the scroll bar.
the scroll bar.
\param document_size \param document_size
float value specifying the document size. float value specifying the document size.
\return \return
Nothing. Nothing.
*/ */
void setDocumentSize(float document_size); void setDocumentSize(float document_size);
/*! /*!
\brief \brief
Set the page size for this scroll bar. Set the page size for this scroll bar.
The page size is typically the amount of data that can be di The page size is typically the amount of data that can be displayed
splayed at one at
time. This value is also used when calculating the amount t one time. This value is also used when calculating the amount the
he position will position will change when you click either side of the scroll bar
change when you click either side of the scroll bar thumb - thumb, the amount the position changes will is (pageSize - overlapS
the amount the ize).
position changes will is (pageSize - overlapSize).
\note \note
The value set has no meaning within the Gui system, it is le The value set has no meaning within the Gui system, it is left up t
ft up to the o the
application to assign appropriate values for the application application to assign appropriate values for the application specif
specific use of ic
the scroll bar. use of the scroll bar.
\param page_size \param page_size
float value specifying the page size. float value specifying the page size.
\return \return
Nothing. Nothing.
*/ */
void setPageSize(float page_size); void setPageSize(float page_size);
/*! /*!
\brief \brief
Set the step size for this scroll bar. Set the step size for this scroll bar.
The step size is typically a single unit of data that can be The step size is typically a single unit of data that can be displa
displayed, this is the yed,
amount the position will change when you click either of the this is the amount the position will change when you click either o
arrow buttons on the f the
scroll bar. (this could be 1 for a single line of text, for arrow buttons on the scroll bar. (this could be 1 for a single lin
example). e of
text, for example).
\note \note
The value set has no meaning within the Gui system, it is le The value set has no meaning within the Gui system, it is left up t
ft up to the o the
application to assign appropriate values for the application application to assign appropriate values for the application specif
specific use of ic
the scroll bar. use of the scroll bar.
\param step_size \param step_size
float value specifying the step size. float value specifying the step size.
\return \return
Nothing. Nothing.
*/ */
void setStepSize(float step_size); void setStepSize(float step_size);
/*! /*!
\brief \brief
Set the overlap size for this scroll bar. Set the overlap size for this scroll bar.
The overlap size is the amount of data from the end of a 'pa The overlap size is the amount of data from the end of a 'page' tha
ge' that will t
remain visible when the position is moved by a page. This i will remain visible when the position is moved by a page. This is
s usually used usually used so that the user keeps some context of where they were
so that the user keeps some context of where they were withi within the document's data when jumping a page at a time.
n the document's
data when jumping a page at a time.
\note \note
The value set has no meaning within the Gui system, it is le The value set has no meaning within the Gui system, it is left up t
ft up to the o the
application to assign appropriate values for the application application to assign appropriate values for the application specif
specific use of ic
the scroll bar. use of the scroll bar.
\param overlap_size \param overlap_size
float value specifying the overlap size. float value specifying the overlap size.
\return \return
Nothing. Nothing.
*/ */
void setOverlapSize(float overlap_size); void setOverlapSize(float overlap_size);
/*! /*!
\brief \brief
Set the current position of scroll bar within the document. Set the current position of scroll bar within the document.
The range of the scroll bar is from 0 to the size of the doc The range of the scroll bar is from 0 to the size of the document m
ument minus the inus
size of a page (0 <= position <= (documentSize - pageSize)), the size of a page (0 <= position <= (documentSize - pageSize)), an
any attempt to y
set the position outside this range will be adjusted so that attempt to set the position outside this range will be adjusted so
it falls within that
the legal range. it falls within the legal range.
\note \note
The returned value has no meaning within the Gui system, it The returned value has no meaning within the Gui system, it is left
is left up to the up
application to assign appropriate values for the application to the application to assign appropriate values for the application
specific use of specific use of the scroll bar.
the scroll bar.
\param position \param position
float value specifying the position of the scroll bar within float value specifying the position of the scroll bar within its
its document.
document.
\return \return
Nothing. Nothing.
*/ */
void setScrollPosition(float position); void setScrollPosition(float position);
/******************************************************************* /*!
****** \brief
Construction / Destruction Sets multiple scrollbar configuration parameters simultaneously.
********************************************************************
*****/
/*!
\brief
Constructor for Scrollbar objects
*/
Scrollbar(const String& type, const String& name);
/*! This function is provided in order to be able to minimise the numbe
\brief r
Destructor for Scrollbar objects of internal state updates that occur when modifying the scrollbar
*/ parameters.
virtual ~Scrollbar(void);
protected: \param document_size
/******************************************************************* Pointer to a float value holding the new value to be used for the
****** scroll bar document size. If this is 0 the document size is left
Implementation Methods unchanged.
********************************************************************
*****/
/*!
\brief
update the size and location of the thumb to properly repres
ent the current state of the scroll bar
*/
void updateThumb(void);
/*! \param page_size
\brief Pointer to a float value holding the new value to be used for the s
return value that best represents current scroll bar positio croll
n given the current location of the thumb. bar page size. If this is 0 the page size is left unchanged.
\return \param step_size
float value that, given the thumb widget position, best repr Pointer to a float value holding the new value to be used for the s
esents the current position for the scroll bar. croll
*/ bar step size. If this is 0 the step size is left unchanged.
float getValueFromThumb(void) const;
/*! \param overlap_size
\brief Pointer to a float value holding the new value to be used for the s
Given window location \a pt, return a value indicating what croll
change should be bar overlap size. If this is 0 then overlap size is left unchanged
made to the scroll bar. .
\param pt \param position
Point object describing a pixel position in window space. Pointer to a float value holding the new value to be used for the s
croll
bar current scroll position. If this is 0 then the current positio
n is
left unchanged.
\return \note
- -1 to indicate scroll bar position should be moved to a lo Even if \a position is 0, the scrollbar position may still change
wer value. depending on how the other changes affect the scrollbar.
- 0 to indicate scroll bar position should not be changed. */
- +1 to indicate scroll bar position should be moved to a hi void setConfig(const float* const document_size,
gher value. const float* const page_size,
*/ const float* const step_size,
float getAdjustDirectionFromPoint(const Point& pt) const; const float* const overlap_size,
const float* const position);
/*! /*!
\brief \brief
update the size and location of the thumb to properly represent the Enable or disable the 'end lock' mode for the scrollbar.
current state of the scroll bar
When enabled and the current position of the scrollbar is at the en
d of
it's travel, the end lock mode of the scrollbar will automatically
update the position when the document and/or page size change in or
der
that the scroll position will remain at the end of it's travel. Th
is
can be used to implement auto-scrolling in certain other widget typ
es.
\param enabled
- true to indicate that end lock mode should be enabled.
- false to indicate that end lock mode should be disabled.
*/ */
//virtual void updateThumb_impl(void) = 0; void setEndLockEnabled(const bool enabled);
/*! /*!
\brief \brief
return value that best represents current scroll bar position given Returns whether the 'end lock'mode for the scrollbar is enabled.
the current location of the thumb.
When enabled, and the current position of the scrollbar is at the e
nd of
it's travel, the end lock mode of the scrollbar will automatically
update the scrollbar position when the document and/or page size ch
ange
in order that the scroll position will remain at the end of it's tr
avel.
This can be used to implement auto-scrolling in certain other widge
t
types.
\return \return
float value that, given the thumb widget position, best represents - true to indicate that the end lock mode is enabled.
the current position for the scroll bar. - false to indicate that the end lock mode is disabled.
*/ */
//virtual float getValueFromThumb_impl(void) const = 0; bool isEndLockEnabled() const;
//! Constructor for Scrollbar objects
Scrollbar(const String& type, const String& name);
//! Destructor for Scrollbar objects
virtual ~Scrollbar(void);
protected:
/*!
\brief
update the size and location of the thumb to properly represent the
current state of the scroll bar
*/
void updateThumb(void);
/*! /*!
\brief \brief
Given window location \a pt, return a value indicating what change return value that best represents current scroll bar position given
should be the
made to the scroll bar. current location of the thumb.
\return
float value that, given the thumb widget position, best represents
the
current position for the scroll bar.
*/
float getValueFromThumb(void) const;
/*!
\brief
Given window location \a pt, return a value indicating what change
should be made to the scroll bar.
\param pt \param pt
Point object describing a pixel position in window space. Point object describing a pixel position in window space.
\return \return
- -1 to indicate scroll bar position should be moved to a lower val ue. - -1 to indicate scroll bar position should be moved to a lower val ue.
- 0 to indicate scroll bar position should not be changed. - 0 to indicate scroll bar position should not be changed.
- +1 to indicate scroll bar position should be moved to a higher va lue. - +1 to indicate scroll bar position should be moved to a higher va lue.
*/ */
//virtual float getAdjustDirectionFromPoint_impl(const Point& pt) con st = 0; float getAdjustDirectionFromPoint(const Point& pt) const;
/*! /** implementation func that updates scroll position value, returns tru
\brief e if
handler function for when thumb moves. * value was changed. NB: Fires no events and does no other updates.
*/ */
bool handleThumbMoved(const EventArgs& e); bool setScrollPosition_impl(const float position);
/*! //! return whether the current scroll position is at the end of the ran
\brief ge.
handler function for when the increase button is clicked. bool isAtEnd() const;
*/
bool handleIncreaseClicked(const EventArgs& e);
/*! //! return the max allowable scroll position value
\brief float getMaxScrollPosition() const;
handler function for when the decrease button is clicked.
*/
bool handleDecreaseClicked(const EventArgs& e);
/*! //! handler function for when thumb moves.
\brief bool handleThumbMoved(const EventArgs& e);
handler function for when thumb tracking begins
*/
bool handleThumbTrackStarted(const EventArgs& e);
/*! //! handler function for when the increase button is clicked.
\brief bool handleIncreaseClicked(const EventArgs& e);
handler function for when thumb tracking begins
*/
bool handleThumbTrackEnded(const EventArgs& e);
/*! //! handler function for when the decrease button is clicked.
\brief bool handleDecreaseClicked(const EventArgs& e);
Return whether this window was inherited from the given clas
s name at some point in the inheritance hierarchy.
\param class_name //! handler function for when thumb tracking begins
The class name that is to be checked. bool handleThumbTrackStarted(const EventArgs& e);
\return //! handler function for when thumb tracking begins
true if this window was inherited from \a class_name. false bool handleThumbTrackEnded(const EventArgs& e);
if not.
*/
virtual bool testClassName_impl(const String& class_name) const
{
if (class_name=="Scrollbar") return true;
return Window::testClassName_impl(class_name);
}
// validate window renderer /*!
\brief
Return whether this window was inherited from the given class name
at
some point in the inheritance hierarchy.
\param class_name
The class name that is to be checked.
\return
true if this window was inherited from \a class_name. false if not.
*/
virtual bool testClassName_impl(const String& class_name) const
{
if (class_name == "Scrollbar") return true;
return Window::testClassName_impl(class_name);
}
//! validate window renderer
virtual bool validateWindowRenderer(const String& name) const virtual bool validateWindowRenderer(const String& name) const
{ {
return (name == "Scrollbar"); return (name == "Scrollbar");
} }
/******************************************************************* // New event handlers for slider widget
****** //! Handler triggered when the scroll position changes
New event handlers for slider widget virtual void onScrollPositionChanged(WindowEventArgs& e);
********************************************************************
*****/
/*!
\brief
Handler triggered when the scroll position changes
*/
virtual void onScrollPositionChanged(WindowEventArgs& e);
/*! //! Handler triggered when the user begins to drag the scroll bar thumb
\brief .
Handler triggered when the user begins to drag the scroll ba virtual void onThumbTrackStarted(WindowEventArgs& e);
r thumb.
*/
virtual void onThumbTrackStarted(WindowEventArgs& e);
/*! //! Handler triggered when the scroll bar thumb is released
\brief virtual void onThumbTrackEnded(WindowEventArgs& e);
Handler triggered when the scroll bar thumb is released
*/
virtual void onThumbTrackEnded(WindowEventArgs& e);
/*! //! Handler triggered when the scroll bar data configuration changes
\brief virtual void onScrollConfigChanged(WindowEventArgs& e);
Handler triggered when the scroll bar data configuration cha
nges
*/
virtual void onScrollConfigChanged(WindowEventArgs& e);
/******************************************************************* // Overridden event handlers
****** virtual void onMouseButtonDown(MouseEventArgs& e);
Overridden event handlers virtual void onMouseWheel(MouseEventArgs& e);
********************************************************************
*****/
virtual void onMouseButtonDown(MouseEventArgs& e);
virtual void onMouseWheel(MouseEventArgs& e);
/******************************************************************* // Implementation Data
****** //! The size of the document / data being scrolled thorugh.
Implementation Data float d_documentSize;
******************************************************************** //! The size of a single 'page' of data.
*****/ float d_pageSize;
float d_documentSize; //!< The size of the document / data //! Step size used for increase / decrease button clicks.
being scrolled thorugh. float d_stepSize;
float d_pageSize; //!< The size of a single 'p //! Amount of overlap when jumping by a page.
age' of data. float d_overlapSize;
float d_stepSize; //!< Step size used for incr //! Current scroll position.
ease / decrease button clicks. float d_position;
float d_overlapSize; //!< Amount of overlap when jumping //! whether 'end lock' mode is enabled.
by a page. bool d_endLockPosition;
float d_position; //!< Current scroll position
.
private: private:
/******************************************************************* // Static Properties for this class
****** static ScrollbarProperties::DocumentSize d_documentSizeProperty;
Static Properties for this class static ScrollbarProperties::PageSize d_pageSizeProperty;
******************************************************************** static ScrollbarProperties::StepSize d_stepSizeProperty;
*****/ static ScrollbarProperties::OverlapSize d_overlapSizeProperty;
static ScrollbarProperties::DocumentSize d_documentSizeProper static ScrollbarProperties::ScrollPosition d_scrollPositionProperty;
ty; static ScrollbarProperties::EndLockEnabled d_endLockEnabledProperty;
static ScrollbarProperties::PageSize d_pageSizeProperty;
static ScrollbarProperties::StepSize d_stepSizeProperty;
static ScrollbarProperties::OverlapSize d_overlapSizePropert
y;
static ScrollbarProperties::ScrollPosition d_scrollPositionProp
erty;
/******************************************************************* //! Adds scrollbar specific properties.
****** void addScrollbarProperties(void);
Private methods
********************************************************************
*****/
void addScrollbarProperties(void);
}; };
} // 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 _CEGUIScrollbar_h_ #endif // end of guard _CEGUIScrollbar_h_
 End of changes. 98 change blocks. 
450 lines changed or deleted 468 lines changed or added


 CEGUIScrollbarProperties.h   CEGUIScrollbarProperties.h 
skipping to change at line 166 skipping to change at line 166
ScrollPosition() : Property( ScrollPosition() : Property(
"ScrollPosition", "ScrollPosition",
"Property to get/set the scroll position of the Scrollbar. Value is a float.", "Property to get/set the scroll position of the Scrollbar. Value is a float.",
"0.000000") "0.000000")
{} {}
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 end lock mode setting for the Scrollbar.
\par Usage:
- Name: EndLockEnabled
- Format: "[text]".
\par Where [Text] is:
- "True" to indicate end lock mode is enabled.
- "False" to indicate end lock mode is disabled.
*/
class EndLockEnabled : public Property
{
public:
EndLockEnabled() : Property(
"EndLockEnabled",
"Property to get/set the 'end lock' mode setting for the Scrollbar.
"
"Value is either \"True\" or \"False\".",
"False")
{}
String get(const PropertyReceiver* receiver) const;
void set(PropertyReceiver* receiver, const String& value);
};
} // End of ScrollbarProperties namespace section } // End of ScrollbarProperties namespace section
} // End of CEGUI namespace section } // End of CEGUI namespace section
#endif // end of guard _CEGUIScrollbarProperties_h_ #endif // end of guard _CEGUIScrollbarProperties_h_
 End of changes. 1 change blocks. 
0 lines changed or deleted 27 lines changed or added


 CEGUIScrolledContainer.h   CEGUIScrolledContainer.h 
skipping to change at line 56 skipping to change at line 56
Helper container window class which is used in the implementation of th e Helper container window class which is used in the implementation of th e
ScrollablePane widget class. ScrollablePane widget class.
*/ */
class CEGUIEXPORT ScrolledContainer : public Window class CEGUIEXPORT ScrolledContainer : public Window
{ {
public: public:
//! Type name for ScrolledContainer. //! Type name for ScrolledContainer.
static const String WidgetTypeName; static const String WidgetTypeName;
//! Namespace for global events //! Namespace for global events
static const String EventNamespace; static const String EventNamespace;
//! Event fired whenever some child changes. /** Event fired whenever some child changes.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ScrolledContainer for which a chi
ld
* window has changed.
*/
static const String EventContentChanged; static const String EventContentChanged;
//! Event fired when the autosize setting changes. /** Event fired when the autosize setting changes.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ScrolledContainer whose auto size
* setting has been changed.
*/
static const String EventAutoSizeSettingChanged; static const String EventAutoSizeSettingChanged;
//! Constructor for ScrolledContainer objects. //! Constructor for ScrolledContainer objects.
ScrolledContainer(const String& type, const String& name); ScrolledContainer(const String& type, const String& name);
//! Destructor for ScrolledContainer objects. //! Destructor for ScrolledContainer objects.
~ScrolledContainer(void); ~ScrolledContainer(void);
/*! /*!
\brief \brief
skipping to change at line 186 skipping to change at line 194
virtual void onAutoSizeSettingChanged(WindowEventArgs& e); virtual void onAutoSizeSettingChanged(WindowEventArgs& e);
//! handles notifications about child windows being moved. //! handles notifications about child windows being moved.
bool handleChildSized(const EventArgs& e); bool handleChildSized(const EventArgs& e);
//! handles notifications about child windows being sized. //! handles notifications about child windows being sized.
bool handleChildMoved(const EventArgs& e); bool handleChildMoved(const EventArgs& e);
// overridden from Window. // overridden from Window.
void drawSelf(const RenderingContext&) {}; void drawSelf(const RenderingContext&) {};
Rect getInnerRectClipper_impl() const; Rect getInnerRectClipper_impl() const;
Rect getNonClientChildWindowContentArea_impl() const;
Rect getClientChildWindowContentArea_impl() const;
Rect getHitTestRect_impl() const; Rect getHitTestRect_impl() const;
void onChildAdded(WindowEventArgs& e); void onChildAdded(WindowEventArgs& e);
void onChildRemoved(WindowEventArgs& e); void onChildRemoved(WindowEventArgs& e);
void onParentSized(WindowEventArgs& e); void onParentSized(WindowEventArgs& e);
//! type definition for collection used to track event connections. //! type definition for collection used to track event connections.
typedef std::multimap<Window*, Event::Connection> ConnectionTracker; typedef std::multimap<Window*, Event::Connection> ConnectionTracker;
//! Tracks event connections we make. //! Tracks event connections we make.
ConnectionTracker d_eventConnections; ConnectionTracker d_eventConnections;
//! Holds extents of the content pane. //! Holds extents of the content pane.
 End of changes. 3 change blocks. 
2 lines changed or deleted 14 lines changed or added


 CEGUIScrolledItemListBase.h   CEGUIScrolledItemListBase.h 
skipping to change at line 59 skipping to change at line 59
public: public:
static const String EventNamespace; //!< Namespace for global events static const String EventNamespace; //!< Namespace for global events
/********************************************************************** ** /********************************************************************** **
Constants Constants
*********************************************************************** **/ *********************************************************************** **/
static const String VertScrollbarNameSuffix; //!< Name suffix for verti cal scrollbar component static const String VertScrollbarNameSuffix; //!< Name suffix for verti cal scrollbar component
static const String HorzScrollbarNameSuffix; //!< Name suffix for horiz ontal scrollbar component static const String HorzScrollbarNameSuffix; //!< Name suffix for horiz ontal scrollbar component
static const String ContentPaneNameSuffix; //!< Name suffix for the c ontent pane component static const String ContentPaneNameSuffix; //!< Name suffix for the c ontent pane component
static const String EventVertScrollbarModeChanged; //!< Event fired whe /** Event fired when the vertical scroll bar mode changes.
n the vertical scroll bar mode changes. * Handlers are passed a const WindowEventArgs reference with
static const String EventHorzScrollbarModeChanged; //!< Event fired whe * WindowEventArgs::window set to the ScrolledItemListBase whose vertic
n the horizontal scroll bar mode change. al
* scroll bar mode has been changed.
*/
static const String EventVertScrollbarModeChanged;
/** Event fired when the horizontal scroll bar mode change.
* Handlers are passed a const WindowEventArgs reference with
* WindowEventArgs::window set to the ScrolledItemListBase whose horizo
ntal
* scroll bar mode has been changed.
*/
static const String EventHorzScrollbarModeChanged;
/********************************************************************** ** /********************************************************************** **
Accessors Accessors
*********************************************************************** **/ *********************************************************************** **/
/*! /*!
\brief \brief
Returns whether the vertical scrollbar is being forced visible. Des pite content size. Returns whether the vertical scrollbar is being forced visible. Des pite content size.
*/ */
bool isVertScrollbarAlwaysShown(void) const {return d_forceVScroll;} bool isVertScrollbarAlwaysShown(void) const {return d_forceVScroll;}
 End of changes. 1 change blocks. 
4 lines changed or deleted 14 lines changed or added


 CEGUISize.h   CEGUISize.h 
skipping to change at line 48 skipping to change at line 48
/*! /*!
\brief \brief
Class that holds the size (width & height) of something. Class that holds the size (width & height) of something.
*/ */
class CEGUIEXPORT Size class CEGUIEXPORT Size
{ {
public: public:
Size(void) {} Size(void) {}
Size(float width, float height) : d_width(width), d_height(height) { } Size(float width, float height) : d_width(width), d_height(height) { }
Size(const Size& v): d_width(v.d_width), d_height(v.d_height) {}
bool operator==(const Size& other) const; bool operator==(const Size& other) const;
bool operator!=(const Size& other) const; bool operator!=(const Size& other) const;
float d_width, d_height; float d_width, d_height;
Size operator*(float c) const
{
return Size(d_width * c, d_height * c);
}
Size operator+(const Size& s) const
{
return Size(d_width + s.d_width, d_height + s.d_height);
}
}; };
} // End of CEGUI namespace section } // End of CEGUI namespace section
#endif // end of guard _CEGUISize_h_ #endif // end of guard _CEGUISize_h_
 End of changes. 2 change blocks. 
0 lines changed or deleted 11 lines changed or added


 CEGUISlider.h   CEGUISlider.h 
skipping to change at line 106 skipping to change at line 106
*/ */
class CEGUIEXPORT Slider : public Window class CEGUIEXPORT Slider : public Window
{ {
public: public:
static const String EventNamespace; //!< Namespace for global events static const String EventNamespace; //!< Namespace for global events
static const String WidgetTypeName; //!< Window factory nam e static const String WidgetTypeName; //!< Window factory nam e
/******************************************************************* ****** /******************************************************************* ******
Event name constants Event name constants
******************************************************************** *****/ ******************************************************************** *****/
static const String EventValueChanged; //!< Event fired whe /** Event fired when the slider value changes.
n the slider value changes. * Handlers are passed a const WindowEventArgs reference with
static const String EventThumbTrackStarted; //!< Name of the eve * WindowEventArgs::window set to the Slider whose value has changed.
nt fired when the user begins dragging the thumb. */
static const String EventThumbTrackEnded; //!< Name of