Merging r6145 through r6171 from trunk to ogl-es branch

[irrlicht.git] / include / IGUIButton.h

diff --git a/include/IGUIButton.h b/include/IGUIButton.h
index 1976adafc1c779f29fee3cf9d8551134b8676b38..88eb97bb8a7897c25eff07f933d28eaa37361a89 100644 (file)
--- a/include/IGUIButton.h
+++ b/include/IGUIButton.h
@@ -139,6 +139,10 @@ namespace gui
                /** \return: The override color */\r
                virtual video::SColor getOverrideColor(void) const = 0;\r
 \r
+               //! Gets the currently used text color\r
+               /** Either a skin-color for the current state or the override color */\r
+               virtual video::SColor getActiveColor() const = 0;\r
+\r
                //! Sets if the button text should use the override color or the color in the gui skin.\r
                /** \param enable: If set to true, the override color, which can be set\r
                with IGUIStaticText::setOverrideColor is used, otherwise the\r