ecere/gui/ListBox: Fixed moving rows updating with wrong index

[sdk] / ecere / src / gui / controls / ListBox.ec

diff --git a/ecere/src/gui/controls/ListBox.ec b/ecere/src/gui/controls/ListBox.ec
index c075102..37cc0eb 100644 (file)
--- a/ecere/src/gui/controls/ListBox.ec
+++ b/ecere/src/gui/controls/ListBox.ec
@@ -184,9 +184,9 @@ public:
                String string;
                int tw = 0;
                if(dataType.type == normalClass || dataType.type == noHeadClass)
-                  string = (char *)dataType._vTbl[__ecereVMethodID_class_OnGetString](dataType, cell.data[0], tempString, userData, null);
+                  string = ((char *(*)(void *, void *, char *, void *, bool *))(void *)dataType._vTbl[__ecereVMethodID_class_OnGetString])(dataType, cell.data[0], tempString, userData, null);
                else
-                  string = (char *)dataType._vTbl[__ecereVMethodID_class_OnGetString](dataType, cell.data, tempString, userData, null);
+                  string = ((char *(*)(void *, void *, char *, void *, bool *))(void *)dataType._vTbl[__ecereVMethodID_class_OnGetString])(dataType, cell.data, tempString, userData, null);
                if(string)
                   display.FontExtent(row.header ? boldFont : font, string, strlen(string), &tw, null);
                else
@@ -258,7 +258,7 @@ public class DataRow
    bool skipCheck;
 #endif
 public:
-   property int tag { set { tag = value; } get { return tag; } };
+   property int64 tag { set { tag = value; } get { return tag; } };
    property DataRow previous { get { return prev; } };
    property DataRow next { get { return next; } };
    property int index { get { return (this && (!parent || parent.IsExpanded())) ? index : -1; } };
@@ -401,7 +401,7 @@ public:
 #endif
             }
 
-            if(value.IsExpanded(this))
+            if(value.IsExpanded())
             {
                DataRow search;
 
@@ -522,10 +522,8 @@ public:
             {
                DataRow nextRow = GetNextRow();
                if(this == listBox.firstRowShown)
-               {
                   listBox.firstRowShown = nextRow;
-                  index = after ? (after.index + 1) : 0;
-               }
+               index = after.index;
 
                // All rows between ROW (exclusive) and AFTER (inclusive) are decremented by one
                // ROW is equal to AFTER's index
@@ -595,18 +593,18 @@ public:
                if(dataType.type == normalClass || dataType.type == noHeadClass)
                {
                   if(cell.data[0] && field.freeData)
-                     dataType._vTbl[__ecereVMethodID_class_OnFree](dataType, cell.data[0]);
+                     ((void (*)(void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnFree])(dataType, cell.data[0]);
 
                   if(eClass_IsDerived(dataType, class(char *)) && field.freeData)
-                     dataType._vTbl[__ecereVMethodID_class_OnCopy](dataType, cell.data, newData);
+                     ((void (*)(void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnCopy])(dataType, cell.data, newData);
                   else
                      cell.data[0] = (void *)newData;
                }
                else
                {
                   // Free old data first
-                  dataType._vTbl[__ecereVMethodID_class_OnFree](dataType, cell.data);
-                  dataType._vTbl[__ecereVMethodID_class_OnCopy](dataType, cell.data, newData);
+                  ((void (*)(void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnFree])(dataType, cell.data);
+                  ((void (*)(void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnCopy])(dataType, cell.data, newData);
                }
             }
             cell.isSet = true;
@@ -635,13 +633,13 @@ public:
                if(dataType.type == normalClass || dataType.type == noHeadClass)
                {
                   if(cell.data[0] && field.freeData)
-                     dataType._vTbl[__ecereVMethodID_class_OnFree](dataType, cell.data[0]);
+                     ((void (*)(void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnFree])(dataType, cell.data[0]);
                   cell.data[0] = null;
                }
                else
                {
                   // Free old data first
-                  dataType._vTbl[__ecereVMethodID_class_OnFree](dataType, cell.data);
+                  ((void (*)(void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnFree])(dataType, cell.data);
                }
             }
             cell.isSet = false;
@@ -650,7 +648,7 @@ public:
       }
    }
 
-   DataRow FindRow(int tag)
+   DataRow FindRow(int64 tag)
    {
       DataRow row = null;
       for(row = subRows.first; row; row = row.next)
@@ -661,7 +659,7 @@ public:
       return row;
    }
 
-   DataRow FindSubRow(int tag)
+   DataRow FindSubRow(int64 tag)
    {
       DataRow row = null;
       for(row = subRows.first; row; row = row.next)
@@ -709,7 +707,7 @@ public:
                }
             }
 
-            if(IsExpanded(this))
+            if(IsExpanded())
             {
                DataRow search;
 
@@ -760,9 +758,9 @@ public:
          DataRow row;
          char string[MAX_F_STRING];
          va_list args;
-         string[sizeof(string)-1] = 0;
          va_start(args, format);
          vsnprintf(string, sizeof(string), format, args);
+         string[sizeof(string)-1] = 0;
          va_end(args);
 
          row = AddRow();
@@ -816,10 +814,10 @@ private:
                if(field.dataType.type == normalClass || field.dataType.type == noHeadClass)
                {
                   if(cell.data[0] && field.freeData)
-                     field.dataType._vTbl[__ecereVMethodID_class_OnFree](field.dataType, cell.data[0]);
+                     ((void (*)(void *, void *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnFree])(field.dataType, cell.data[0]);
                }
                else
-                  field.dataType._vTbl[__ecereVMethodID_class_OnFree](field.dataType, cell.data);
+                  ((void (*)(void *, void *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnFree])(field.dataType, cell.data);
             }
          }
          next = cell.next;
@@ -856,13 +854,13 @@ private:
       {
          if(sortField.dataType.type == normalClass || sortField.dataType.type == noHeadClass)
          {
-            result = sortField.dataType._vTbl[__ecereVMethodID_class_OnCompare](sortField.dataType, 
+            result = ((int (*)(void *, void *, void *))(void *)sortField.dataType._vTbl[__ecereVMethodID_class_OnCompare])(sortField.dataType, 
                (cell1.isSet && cell1.data) ? cell1.data[0] : null, 
                (cell2.isSet && cell2.data) ? cell2.data[0] : null);
          }
          else
          {
-            result = sortField.dataType._vTbl[__ecereVMethodID_class_OnCompare](sortField.dataType, 
+            result = ((int (*)(void *, void *, void *))(void *)sortField.dataType._vTbl[__ecereVMethodID_class_OnCompare])(sortField.dataType, 
                cell1.isSet ? cell1.data : null, 
                cell2.isSet ? cell2.data : null);
          }
@@ -942,7 +940,7 @@ private:
 
    DataRow prev, next;
    OldList cells;
-   int tag;
+   int64 tag;
    SelectedFlag selectedFlag;
    ListBox listBox;
    bool header;
@@ -1160,7 +1158,7 @@ public:
                stayOnTop = true;
                inactive = true;
                dontScrollVert = true;
-               id = (uint)addedField;
+               id = (uint64)addedField;
                text = addedField.header;
                bevel = (!guiApp.textMode && !style.clearHeader);
                ellipsis = true;
@@ -1247,10 +1245,10 @@ public:
                      if(field.dataType.type == normalClass || field.dataType.type == noHeadClass)
                      {
                         if(cell.data[0] && field.freeData)
-                           field.dataType._vTbl[__ecereVMethodID_class_OnFree](field.dataType, cell.data[0]);
+                           ((void (*)(void *, void *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnFree])(field.dataType, cell.data[0]);
                      }
                      else
-                        field.dataType._vTbl[__ecereVMethodID_class_OnFree](field.dataType, cell.data);
+                        ((void (*)(void *, void *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnFree])(field.dataType, cell.data);
                   }
 
                   row.cells.Remove(cell);
@@ -1450,10 +1448,10 @@ public:
 
          char string[MAX_F_STRING];
          va_list args;
-         string[sizeof(string)-1] = 0;
 
          va_start(args, format);
          vsnprintf(string, sizeof(string), format ? format : "", args);
+         string[sizeof(string)-1] = 0;
          va_end(args);
 
          row = AddRow();
@@ -1547,7 +1545,7 @@ public:
       }
    }
 
-   DataRow FindRow(int tag)
+   DataRow FindRow(int64 tag)
    {
       if(this)
       {
@@ -1580,7 +1578,7 @@ public:
                   void * data = row.GetData(field);
                   char tempString[1024] = "";
                   bool needClass = false;
-                  char * string = (char *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString](field.dataType, data, tempString, null, &needClass);
+                  char * string = ((char *(*)(void *, void *, char *, void *, bool *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString])(field.dataType, data, tempString, null, &needClass);
 
                   if(string && string[0])
                      checkNextField = false;
@@ -1614,7 +1612,7 @@ public:
                      void * data = row.GetData(field);
                      char tempString[1024] = "";
                      bool needClass = false;
-                     char * string = (char *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString](field.dataType, data, tempString, null, &needClass);
+                     char * string = ((char *(*)(void *, void *, char *, void *, bool *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString])(field.dataType, data, tempString, null, &needClass);
 
                      if(string && string[0])
                         checkNextField = false;
@@ -1652,7 +1650,7 @@ public:
                      void * data = row.GetData(field);
                      char tempString[1024] = "";
                      bool needClass = false;
-                     char * string = (char *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString](field.dataType, data, tempString, null, &needClass);
+                     char * string = ((char *(*)(void *, void *, char *, void *, bool *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString])(field.dataType, data, tempString, null, &needClass);
 
                      if(string && string[0])
                         checkNextField = false;
@@ -1701,7 +1699,7 @@ public:
                      void * data = row.GetData(field);
                      char tempString[1024] = "";
                      bool needClass = false;
-                     char * string = (char *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString](field.dataType, data, tempString, null, &needClass);
+                     char * string = ((char *(*)(void *, void *, char *, void *, bool *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString])(field.dataType, data, tempString, null, &needClass);
 
                      if(string && string[0])
                         checkNextField = false;
@@ -1716,7 +1714,7 @@ public:
       return null;
    }
 
-   DataRow FindSubRow(int tag)
+   DataRow FindSubRow(int64 tag)
    {
       if(this)
       {
@@ -1840,7 +1838,7 @@ public:
       return (void *)currentRow.GetData(field);
    }
 
-   int GetTag()
+   int64 GetTag()
    {
       return currentRow ? currentRow.tag : 0;
    }
@@ -2406,7 +2404,7 @@ private:
             surface.SetForeground(foreground);
             surface.SetBackground(background);
 
-            class(String)._vTbl[__ecereVMethodID_class_OnDisplay](class(String), "(none)", surface, x, y - 1 + (rowHeight - fontH)/2, width - EXTRA_SPACE/2, null, Alignment::left, dataDisplayFlags);
+            ((void (*)(void *, void *, void *, int, int, int, void *, uint, uint))(void *)class(String)._vTbl[__ecereVMethodID_class_OnDisplay])(class(String), "(none)", surface, x, y - 1 + (rowHeight - fontH)/2, width - EXTRA_SPACE/2, null, Alignment::left, dataDisplayFlags);
          }
          else
          {
@@ -2460,9 +2458,9 @@ private:
                   surface.SetBackground(background);
 
                   if(field.dataType.type == noHeadClass || field.dataType.type == normalClass)
-                     field.dataType._vTbl[__ecereVMethodID_class_OnDisplay](field.dataType, cell.data[0], surface, x, y - 1 + (rowHeight - fontH)/2, width - EXTRA_SPACE/2, field.userData, field.alignment, dataDisplayFlags);
+                     ((void (*)(void *, void *, void *, int, int, int, void *, uint, uint))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnDisplay])(field.dataType, cell.data[0], surface, x, y - 1 + (rowHeight - fontH)/2, width - EXTRA_SPACE/2, field.userData, field.alignment, dataDisplayFlags);
                   else
-                     field.dataType._vTbl[__ecereVMethodID_class_OnDisplay](field.dataType, cell.data, surface, x, y - 1 + (rowHeight - fontH)/2, width - EXTRA_SPACE/2, field.userData, field.alignment, dataDisplayFlags);
+                     ((void (*)(void *, void *, void *, int, int, int, void *, uint, uint))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnDisplay])(field.dataType, cell.data, surface, x, y - 1 + (rowHeight - fontH)/2, width - EXTRA_SPACE/2, field.userData, field.alignment, dataDisplayFlags);
                }
 
                if(!isActive && dataDisplayFlags.selected && style.alwaysEdit && field.editable)
@@ -3048,9 +3046,9 @@ private:
                         char * string;
                         int tw, th;
                         if(field.dataType.type == normalClass || field.dataType.type == noHeadClass)
-                           string = (char *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString](field.dataType, cell.data[0], tempString, field.userData, null);
+                           string = ((char *(*)(void *, void *, char *, void *, bool *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString])(field.dataType, cell.data[0], tempString, field.userData, null);
                         else
-                           string = (char *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString](field.dataType, cell.data, tempString, field.userData, null);
+                           string = ((char *(*)(void *, void *, char *, void *, bool *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString])(field.dataType, cell.data, tempString, field.userData, null);
                         /* GCC-4.4 Bug!
                        if(!string) string = "";
                         display.FontExtent(row.header ? boldFont : font, string, strlen(string), &tw, &th);
@@ -4029,7 +4027,7 @@ private:
                void * data = row.GetData(field);
                char tempString[1024] = "";
                bool needClass = false;
-               char * string = data ? (char *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString](field.dataType, data, tempString, null, &needClass) : null;
+               char * string = data ? ((char *(*)(void *, void *, char *, void *, bool *))(void *)field.dataType._vTbl[__ecereVMethodID_class_OnGetString])(field.dataType, data, tempString, null, &needClass) : null;
 
                if(string && string[0])
                   checkNextField = false;