extras/gui/controls/CheckListBox: Fixed for static linking

[sdk] / extras / gui / controls / CheckListBox.ec

diff --git a/extras/gui/controls/CheckListBox.ec b/extras/gui/controls/CheckListBox.ec
index 049e26a..84474d5 100644 (file)
--- a/extras/gui/controls/CheckListBox.ec
+++ b/extras/gui/controls/CheckListBox.ec
@@ -1,4 +1,8 @@
+#ifdef ECERE_STATIC
+import static "ecere"
+#else
 import "ecere"
+#endif
 
 class CheckListBoxButton : Button
 {
@@ -31,8 +35,9 @@ class CheckListBoxButton : Button
 
 class CheckListBox : ListBox
 {
-   Map<int, CheckListBoxButton> buttonMaps { };
+   Map<uintptr, CheckListBoxButton> buttonMaps { };
    AVLTree<DataRow> rowChecks { };
+   AVLTree<DataRow> rowDisabled { };
    int checkIndent;
 
    checkIndent = 20;
@@ -53,8 +58,8 @@ class CheckListBox : ListBox
       {
          if(collapsed)
          {
-            MapIterator<int, Button> it { map = listBox.buttonMaps };
-            if(it.Index((int)r, false))
+            MapIterator<uintptr, Button> it { map = listBox.buttonMaps };
+            if(it.Index((uintptr)r, false))
             {
                Button checkBox = it.data;
                if(checkBox)
@@ -76,7 +81,7 @@ class CheckListBox : ListBox
       }
       for(r = row.GetNextRow(); r; r = r.GetNextRow())
       {
-         Button checkBox = listBox.buttonMaps[(int)r];
+         Button checkBox = listBox.buttonMaps[(uintptr)r];
          if(checkBox)
             checkBox.position.y = 1 + (r.index + listBox.hasHeader) * listBox.rowHeight;
       }
@@ -101,10 +106,10 @@ class CheckListBox : ListBox
       int indent = checkIndent;
 
       for(parent = row.parent; parent; parent = parent.parent) indent += 20;
-      button = buttonMaps[(int)row];
+      button = buttonMaps[(uintptr)row];
       if(!button) button = CheckListBoxButton { this };
       button.position = { 2 + indent, 1+(row.index + hasHeader) * rowHeight };
-      button.id = (int)row;
+      button.id = (uintptr)row;
 
       for(parent = row; parent; parent = parent.parent) if(rowChecks.Find(parent)) break;
       if(parent)
@@ -117,8 +122,10 @@ class CheckListBox : ListBox
          button.checked = CheckPartialChecks(row);
          button.buttonState = button.checked ? down : up;
       }
+      if(rowDisabled.Find(row))
+         button.disabled = true;
       button.Create();
-      buttonMaps[(int)row] = button;
+      buttonMaps[(uintptr)row] = button;
       if(recurse && !row.collapsed)
       {
          DataRow r;
@@ -151,8 +158,8 @@ class CheckListBox : ListBox
 
    void ToggleCheck(DataRow row)
    {
-      CheckListBoxButton checkBox = buttonMaps[(int)row];
-      if(checkBox)
+      CheckListBoxButton checkBox = buttonMaps[(uintptr)row];
+      if(checkBox && !checkBox.disabled)
       {
          bool checked = false;
          DataRow r;
@@ -170,7 +177,7 @@ class CheckListBox : ListBox
    {
       if(!row.parent || !row.parent.collapsed)
       {
-         CheckListBoxButton button = buttonMaps[(int)row];
+         CheckListBoxButton button = buttonMaps[(uintptr)row];
          if(button)
          {
             bool wasChecked = button.checked;
@@ -184,16 +191,15 @@ class CheckListBox : ListBox
          for(r = row.firstRow; r; r = r.next)
             UncheckBoxes(r);
       }
-      NotifyChanged(master, this, row);
+      NotifyChecked(master, this, row);
    }
    
    void UnsetChildren(DataRow row)
    {
       DataRow r;
-      CheckListBoxButton button = buttonMaps[(int)row];
+      CheckListBoxButton button = buttonMaps[(uintptr)row];
       if(button)
       {
-         bool wasChecked = button.checked;
          button.checked = true;
          button.buttonState = up;
       }
@@ -205,7 +211,7 @@ class CheckListBox : ListBox
          if(it.Find(r))
             it.Remove();
          UnsetChildren(r);
-         NotifyChanged(master, this, r);
+         NotifyChecked(master, this, r);
       }      
    }
    
@@ -221,7 +227,7 @@ class CheckListBox : ListBox
       if(checked != wasChecked)
       {
          modifiedDocument = true;
-         // NotifyChanged(master, this, row);
+         // NotifyChecked(master, this, row);
          if(checked)
          {
             DataRow rr = row;
@@ -234,25 +240,26 @@ class CheckListBox : ListBox
                   if(r != rr && !rowChecks.Find(r))
                      break;
                }
-               if(r || !row.parent) break;
+               if(r || !rr.parent) break;
                rr = rr.parent;
             }
 
-            rowChecks.Add(row);
+            rowChecks.Add(rr);
 
             // Take out all children from rowChecks, checking them all
-            UnsetChildren(row);
+            UnsetChildren(rr);
+
+            NotifyChecked(master, this, row);
 
-            for(parent = row.parent; parent; parent = parent.parent)
+            for(parent = rr.parent; parent; parent = parent.parent)
             {
-               CheckListBoxButton button = buttonMaps[(int)parent];
+               CheckListBoxButton button = buttonMaps[(uintptr)parent];
                if(button)
                {
-                  // Partial Check
                   button.checked = true;
                   button.buttonState = down;
 
-                  NotifyChanged(master, this, parent);
+                  NotifyChecked(master, this, parent);
                }
             }
          }
@@ -260,6 +267,7 @@ class CheckListBox : ListBox
          {
             DataRow rr = row;
 
+            parent = rr.parent;
             while(rr)
             {
                Iterator<DataRow> it { rowChecks };
@@ -271,7 +279,7 @@ class CheckListBox : ListBox
                else
                {
                   DataRow r;
-                  for(r = row.parent.firstRow; r; r = r.next)
+                  for(r = rr.parent.firstRow; r; r = r.next)
                   {
                      if(r != rr)
                         rowChecks.Add(r);
@@ -279,11 +287,12 @@ class CheckListBox : ListBox
                   rr = rr.parent;
                }
             }
+
             UncheckBoxes(row);
 
-            for(parent = row.parent; parent; parent = parent.parent)
+            for(; parent; parent = parent.parent)
             {
-               CheckListBoxButton button = buttonMaps[(int)parent];
+               CheckListBoxButton button = buttonMaps[(uintptr)parent];
                if(button)
                {
                   if(CheckPartialChecks(parent))
@@ -297,12 +306,10 @@ class CheckListBox : ListBox
                      button.buttonState = up;
                   }
 
-                  NotifyChanged(master, this, parent);
+                  NotifyChecked(master, this, parent);
                }
             }
          }
-
-         NotifyChanged(master, this, row);
       }
    }
    
@@ -339,7 +346,7 @@ class CheckListBox : ListBox
 public:
    bool IsChecked(DataRow row)
    {
-      CheckListBoxButton button = buttonMaps[(int)row];
+      CheckListBoxButton button = buttonMaps[(uintptr)row];
       DataRow parent;
       for(parent = row; parent; parent = parent.parent) if(rowChecks.Find(parent)) return true;
       // For partially checked because of children:
@@ -348,5 +355,23 @@ public:
       return false;
    }
 
-   // virtual void Window::NotifyChecked(CheckListBox listBox, DataRow row);
+   virtual void Window::NotifyChecked(CheckListBox listBox, DataRow row);
+
+   void SetDisabled(DataRow row, bool disabled)
+   {
+      CheckListBoxButton checkBox = buttonMaps[(uintptr)row];
+      if(checkBox)
+         checkBox.disabled = disabled;
+
+      if(rowDisabled.Find(row))
+      {
+         if(!disabled)
+            rowDisabled.TakeOut(row);
+      }
+      else
+      {
+         if(disabled)
+            rowDisabled.Add(row);
+      }
+   }
 };