Merge "Remove trailing spaces on auto generated backup names" into android-4.3
diff --git a/gui/image.cpp b/gui/image.cpp
index 45d8636..31d9418 100644
--- a/gui/image.cpp
+++ b/gui/image.cpp
@@ -25,7 +25,7 @@
#include "rapidxml.hpp"
#include "objects.hpp"
-GUIImage::GUIImage(xml_node<>* node)
+GUIImage::GUIImage(xml_node<>* node) : Conditional(node)
{
xml_attribute<>* attr;
xml_node<>* child;
@@ -79,6 +79,9 @@
int GUIImage::Render(void)
{
+ if (!isConditionTrue())
+ return 0;
+
if (isHighlighted && mHighlightImage && mHighlightImage->GetResource()) {
gr_blit(mHighlightImage->GetResource(), 0, 0, mRenderW, mRenderH, mRenderX, mRenderY);
return 0;
diff --git a/gui/objects.hpp b/gui/objects.hpp
index 1e272b2..c259fd4 100644
--- a/gui/objects.hpp
+++ b/gui/objects.hpp
@@ -215,7 +215,7 @@
};
// GUIImage - Used for static image
-class GUIImage : public RenderObject
+class GUIImage : public RenderObject, public Conditional
{
public:
GUIImage(xml_node<>* node);