Merging r6145 through r6171 from trunk to ogl-es branch

[irrlicht.git] / source / Irrlicht / CGUIEnvironment.h

diff --git a/source/Irrlicht/CGUIEnvironment.h b/source/Irrlicht/CGUIEnvironment.h
index 58b7f54536869b238f8b818ace8e6ae5b8a25424..e87e236feac5d6bdf881ad176e058dc005f9d1d1 100644 (file)
--- a/source/Irrlicht/CGUIEnvironment.h
+++ b/source/Irrlicht/CGUIEnvironment.h
@@ -31,7 +31,7 @@ public:
        virtual ~CGUIEnvironment();\r
 \r
        //! draws all gui elements\r
-       virtual void drawAll() _IRR_OVERRIDE_;\r
+       virtual void drawAll(bool useScreenSize) _IRR_OVERRIDE_;\r
 \r
        //! returns the current video driver\r
        virtual video::IVideoDriver* getVideoDriver() const _IRR_OVERRIDE_;\r
@@ -269,8 +269,14 @@ public:
        //! Get the way the gui does handle focus changes\r
        virtual u32 getFocusBehavior() const _IRR_OVERRIDE_;\r
 \r
+       //! Adds a IGUIElement to deletion queue.\r
+       virtual void addToDeletionQueue(IGUIElement* element) _IRR_OVERRIDE_;\r
+\r
 private:\r
 \r
+       //! clears the deletion queue\r
+       void clearDeletionQueue();\r
+\r
        void updateHoveredElement(core::position2d<s32> mousePos);\r
 \r
        void loadBuiltInFont();\r
@@ -322,6 +328,8 @@ private:
        IEventReceiver* UserReceiver;\r
        IOSOperator* Operator;\r
        u32 FocusFlags;\r
+       core::array<IGUIElement*> DeletionQueue;\r
+\r
        static const io::path DefaultFontName;\r
 };\r
 \r