Some cleanups and button, radiobutton and checkbox now take into account

disabled status.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/gui/checkbox.cpp b/src/gui/checkbox.cpp
index 88b3f975..b231ec64 100644
--- a/src/gui/checkbox.cpp
+++ b/src/gui/checkbox.cpp
@@ -43,15 +43,15 @@ void CheckBox::drawBox(gcn::Graphics* graphics) {
     getAbsolutePosition(x, y);
 
     if (mMarked) {
-        if (false /*disabled*/) {
-            box = checkBoxDisabledChecked;
-        } else {
+        if (isEnabled()) {
             box = checkBoxChecked;
+        } else {
+            box = checkBoxDisabledChecked;
         }
-    } else if (false /*disabled*/) {
-        box = checkBoxDisabled;
-    } else {
+    } else if (isEnabled()) {
         box = checkBoxNormal;
+    } else {
+        box = checkBoxDisabled;
     }
 
     x += 2;