CEGUIButtonBase.h   CEGUIButtonBase.h 
skipping to change at line 73 skipping to change at line 73
/*! /*!
\brief \brief
Return true if the button widget is in the pushed state. Return true if the button widget is in the pushed state.
\return \return
true if the button-type widget is pushed, false if the widge t is not pushed. true if the button-type widget is pushed, false if the widge t is not pushed.
*/ */
bool isPushed(void) const {return d_pushed;} bool isPushed(void) const {return d_pushed;}
/** Internal function to set button's pushed state. Normally you would
* not call this, except perhaps when building compound widgets.
*/
void setPushedState(const bool pushed);
/******************************************************************* ****** /******************************************************************* ******
Construction and Destruction Construction and Destruction
******************************************************************** *****/ ******************************************************************** *****/
/*! /*!
\brief \brief
Constructor for ButtonBase objects Constructor for ButtonBase objects
*/ */
ButtonBase(const String& type, const String& name); ButtonBase(const String& type, const String& name);
/*! /*!
 End of changes. 1 change blocks. 
0 lines changed or deleted 5 lines changed or added


 CEGUIFalPropertyDefinition.h   CEGUIFalPropertyDefinition.h 
skipping to change at line 58 skipping to change at line 58
PropertyDefinition(const String& name, const String& initialValue, bool redrawOnWrite, bool layoutOnWrite); PropertyDefinition(const String& name, const String& initialValue, bool redrawOnWrite, bool layoutOnWrite);
//! Constructor. //! Constructor.
PropertyDefinition(const String& name, const String& initialValue, PropertyDefinition(const String& name, const String& initialValue,
const String& help, bool redrawOnWrite, const String& help, bool redrawOnWrite,
bool layoutOnWrite); 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);
// overrides
void initialisePropertyReceiver(PropertyReceiver* receiver) const;
protected: protected:
void writeXMLElementType(XMLSerializer& xml_stream) const; void writeXMLElementType(XMLSerializer& xml_stream) const;
String d_userStringName; String d_userStringName;
}; };
} // End of CEGUI namespace section } // End of CEGUI namespace section
#endif // end of guard _CEGUIFalPropertyDefinition_h_ #endif // end of guard _CEGUIFalPropertyDefinition_h_
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 CEGUIFalPropertyLinkDefinition.h   CEGUIFalPropertyLinkDefinition.h 
skipping to change at line 60 skipping to change at line 60
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) . //! add a new link target to \a property on \a widget (name suffix) .
void addLinkTarget(const String& widget, const String& property); void addLinkTarget(const String& widget, const String& property);
//! clear all link targets from this link definition. //! clear all link targets from this link definition.
void clearLinkTargets(); 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);
// overrides
void initialisePropertyReceiver(PropertyReceiver* receiver) const;
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.
skipping to change at line 84 skipping to change at line 86
This will be removed in 0.8.x. Use the version taking a suffix This will be removed in 0.8.x. Use the version taking a suffix
string instead! string instead!
*/ */
const Window* getTargetWindow(const PropertyReceiver* receiver) con st; const Window* getTargetWindow(const PropertyReceiver* receiver) con st;
/*! /*!
\deprecated \deprecated
This will be removed in 0.8.x. Use the version taking a suffix This will be removed in 0.8.x. Use the version taking a suffix
string instead! string instead!
*/ */
Window* getTargetWindow(PropertyReceiver* receiver); Window* getTargetWindow(PropertyReceiver* receiver) const;
//! Return a pointer to the target window with the given suffix. //! Return a pointer to the target window with the given suffix.
const Window* getTargetWindow(const PropertyReceiver* receiver, const Window* getTargetWindow(const PropertyReceiver* receiver,
const String& name_suffix) const; const String& name_suffix) const;
//! Return a pointer to the target window with the given suffix. //! Return a pointer to the target window with the given suffix.
Window* getTargetWindow(PropertyReceiver* receiver, Window* getTargetWindow(PropertyReceiver* receiver,
const String& name_suffix); const String& name_suffix) const;
//! Updates all linked properties to the given value.
void updateLinkTargets(PropertyReceiver* receiver,
const String& value) const;
//! Internal struct used to keep track of targets. //! Internal struct used to keep track of targets.
struct LinkTarget struct LinkTarget
{ {
//! name suffix of the target widget. //! name suffix of the target widget.
String d_widgetNameSuffix; String d_widgetNameSuffix;
//! the property to use on the target widget. //! the property to use on the target widget.
String d_targetProperty; String d_targetProperty;
}; };
 End of changes. 3 change blocks. 
2 lines changed or deleted 8 lines changed or added


 CEGUIGroupBox.h   CEGUIGroupBox.h 
skipping to change at line 115 skipping to change at line 115
/*! /*!
\brief \brief
Returns the content pane held by this GroupBox. Returns the content pane held by this GroupBox.
\return \return
Pointer to a Window instance. Pointer to a Window instance.
*/ */
Window * getContentPane() const; Window * getContentPane() const;
protected: protected:
// Overridden from Window
/*!
\brief
Initializes the components necessary.
*/
virtual void initialiseComponents();
/*! /*!
\brief \brief
Add given window to child list at an appropriate pos ition. Add given window to child list at an appropriate pos ition.
*/ */
virtual void addChild_impl(Window* wnd); virtual void addChild_impl(Window* wnd);
/*! /*!
\brief \brief
Remove our child again when necessary. Remove our child again when necessary.
*/ */
 End of changes. 1 change blocks. 
8 lines changed or deleted 0 lines changed or added


 CEGUIProperty.h   CEGUIProperty.h 
skipping to change at line 176 skipping to change at line 176
/*! /*!
\brief \brief
Writes out an XML representation of this class to the given stream. Writes out an XML representation of this class to the given stream.
\note \note
This would normally have been implemented via XMLGenerator base cla ss, but in this This would normally have been implemented via XMLGenerator base cla ss, but in this
case we require the target PropertyReceiver in order to obtain the property value. case we require the target PropertyReceiver in order to obtain the property value.
*/ */
virtual void writeXMLToStream(const PropertyReceiver* receiver, XMLSeri alizer& xml_stream) const; virtual void writeXMLToStream(const PropertyReceiver* receiver, XMLSeri alizer& xml_stream) const;
//! function to allow initialisation of a PropertyReceiver.
virtual void initialisePropertyReceiver(PropertyReceiver* receiver) con
st {}
protected: protected:
String d_name; //!< String that stores the Property name. String d_name; //!< String that stores the Property name.
String d_help; //!< String that stores the Property help te xt. String d_help; //!< String that stores the Property help te xt.
String d_default; //!< String that stores the Property default value string. String d_default; //!< String that stores the Property default value string.
bool d_writeXML; //!< Specifies whether writeXMLToStream should d o anything for this property. bool d_writeXML; //!< Specifies whether writeXMLToStream should d o anything for this property.
}; };
} // End of CEGUI namespace section } // End of CEGUI namespace section
#endif // end of guard _CEGUIProperty_h_ #endif // end of guard _CEGUIProperty_h_
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 lines changed or added


 CEGUIVersion.h   CEGUIVersion.h 
skipping to change at line 42 skipping to change at line 42
*************************************************************************/ *************************************************************************/
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
#ifndef _CEGUIVersion_h_ #ifndef _CEGUIVersion_h_
#define _CEGUIVersion_h_ #define _CEGUIVersion_h_
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// Define CEGUI version // Define CEGUI version
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
#define CEGUI_VERSION_MAJOR 0 #define CEGUI_VERSION_MAJOR 0
#define CEGUI_VERSION_MINOR 7 #define CEGUI_VERSION_MINOR 7
#define CEGUI_VERSION_PATCH 6 #define CEGUI_VERSION_PATCH 7
#endif // end of guard _CEGUIVersion_h_ #endif // end of guard _CEGUIVersion_h_
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 CEGUIWindow.h   CEGUIWindow.h 
skipping to change at line 4155 skipping to change at line 4155
virtual int writePropertiesXML(XMLSerializer& xml_stream) const; virtual int writePropertiesXML(XMLSerializer& xml_stream) const;
virtual int writeChildWindowsXML(XMLSerializer& xml_stream) const; virtual int writeChildWindowsXML(XMLSerializer& xml_stream) const;
virtual bool writeAutoChildWindowXML(XMLSerializer& xml_stream) const; virtual bool writeAutoChildWindowXML(XMLSerializer& xml_stream) const;
// constrain given UVector2 to window's min size, return if size change d. // constrain given UVector2 to window's min size, return if size change d.
bool constrainUVector2ToMinSize(const Size& base_sz, UVector2& sz); bool constrainUVector2ToMinSize(const Size& base_sz, UVector2& sz);
// constrain given UVector2 to window's max size, return if size change d. // constrain given UVector2 to window's max size, return if size change d.
bool constrainUVector2ToMaxSize(const Size& base_sz, UVector2& sz); bool constrainUVector2ToMaxSize(const Size& base_sz, UVector2& sz);
void markAllCachedRectsInvalid();
//! calculate constrained pixel size of the window (outer rect)
void calculatePixelSize();
//! helper to fire events based on changes to area rect
void fireAreaChangeEvents(const bool moved, const bool sized);
/********************************************************************** *** /********************************************************************** ***
Properties for Window base class Properties for Window base class
*********************************************************************** **/ *********************************************************************** **/
static WindowProperties::Alpha d_alphaProperty; static WindowProperties::Alpha d_alphaProperty;
static WindowProperties::AlwaysOnTop d_alwaysOnTopProperty; static WindowProperties::AlwaysOnTop d_alwaysOnTopProperty;
static WindowProperties::ClippedByParent d_clippedByParentProperty; static WindowProperties::ClippedByParent d_clippedByParentProperty;
static WindowProperties::DestroyedByParent d_destroyedByParentProperty ; static WindowProperties::DestroyedByParent d_destroyedByParentProperty ;
static WindowProperties::Disabled d_disabledProperty; static WindowProperties::Disabled d_disabledProperty;
static WindowProperties::Font d_fontProperty; static WindowProperties::Font d_fontProperty;
static WindowProperties::ID d_IDProperty; static WindowProperties::ID d_IDProperty;
 End of changes. 1 change blocks. 
0 lines changed or deleted 6 lines changed or added

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