[Scummvm-cvs-logs] SF.net SVN: scummvm: [29282] scummvm/trunk/gui

sev at users.sourceforge.net sev at users.sourceforge.net
Sun Oct 28 13:02:10 CET 2007


Revision: 29282
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29282&view=rev
Author:   sev
Date:     2007-10-28 05:02:09 -0700 (Sun, 28 Oct 2007)

Log Message:
-----------
Proper implementation of ".enabled" theme widget property.

Modified Paths:
--------------
    scummvm/trunk/gui/widget.cpp
    scummvm/trunk/gui/widget.h

Modified: scummvm/trunk/gui/widget.cpp
===================================================================
--- scummvm/trunk/gui/widget.cpp	2007-10-28 11:34:54 UTC (rev 29281)
+++ scummvm/trunk/gui/widget.cpp	2007-10-28 12:02:09 UTC (rev 29282)
@@ -133,6 +133,12 @@
 	}
 	return 0;
 }
+bool Widget::isEnabled() const {
+	if (g_gui.evaluator()->getVar(_name + ".enabled") == 0) {
+		return false;
+	}
+	return _flags & WIDGET_ENABLED;
+}
 
 bool Widget::isVisible() const {
 	if (g_gui.evaluator()->getVar(_name + ".visible") == 0)

Modified: scummvm/trunk/gui/widget.h
===================================================================
--- scummvm/trunk/gui/widget.h	2007-10-28 11:34:54 UTC (rev 29281)
+++ scummvm/trunk/gui/widget.h	2007-10-28 12:02:09 UTC (rev 29282)
@@ -148,7 +148,7 @@
 	int getHints() const		{ return _hints; }
 
 	void setEnabled(bool e)		{ if (e) setFlags(WIDGET_ENABLED); else clearFlags(WIDGET_ENABLED); }
-	bool isEnabled() const		{ return _flags & WIDGET_ENABLED; }
+	bool isEnabled() const;
 	bool isVisible() const;
 
 protected:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list