ecere, ide: Replaced integer types by 64 bit ints for tags, ids

diff --git a/compiler/libec/src/pass16.ec b/compiler/libec/src/pass16.ec
index 0f7969f..dccd8fc 100644 (file)
--- a/compiler/libec/src/pass16.ec
+++ b/compiler/libec/src/pass16.ec
@@ -149,7 +149,7 @@ static bool ProcessInstMembers_SimpleMemberEnsure(DataMember parentMember, Insta
                            }
 
                            /*
-                           BTNamedLink link = parentMember.membersAlpha.Find((uint)firstID.string);
+                           BTNamedLink link = parentMember.membersAlpha.Find((uintptr)firstID.string);
                            if(link)
                            {
                               curMember = link.data;
@@ -1655,7 +1655,7 @@ static bool ProcessBracketInst_DataMember(DataMember parentMember, Instantiation
                            subMemberStackPos = _subMemberStackPos;
                         }
                         /*
-                        BTNamedLink link = parentMember.membersAlpha.Find((uint)firstID.string);
+                        BTNamedLink link = parentMember.membersAlpha.Find((uintptr)firstID.string);
                         if(link)
                         {
                            curMember = link.data;

diff --git a/ecere/src/gui/Anchor.ec b/ecere/src/gui/Anchor.ec
index de5a2d7..a85c9cd 100644 (file)
--- a/ecere/src/gui/Anchor.ec
+++ b/ecere/src/gui/Anchor.ec
@@ -281,7 +281,7 @@ private class AnchorButton : Button
       Anchor anchor = anchorDropBox.anchorValue;
       Window control = anchorDropBox.control;
       DataBox dropMaster = (DataBox)anchorDropBox.master;
-      int id = button.id;
+      int64 id = button.id;
 
       switch(id)
       {
@@ -403,7 +403,7 @@ private class AnchorRelButton : Button
       Anchor anchor = anchorDropBox.anchorValue;
       Window control = anchorDropBox.control;
       DataBox dropMaster = (DataBox)anchorDropBox.master;
-      int id = button.id;
+      int64 id = button.id;
 
       if((id == 0 || id == 2) && ((!anchor.left.type && !anchor.right.type) || anchor.left.type == middleRelative))
       {

diff --git a/ecere/src/gui/Window.ec b/ecere/src/gui/Window.ec
index d34d586..60b8527 100644 (file)
--- a/ecere/src/gui/Window.ec
+++ b/ecere/src/gui/Window.ec
@@ -44,7 +44,7 @@ define statusBarHeight = 18;
 
 default extern int __ecereVMethodID___ecereNameSpace__ecere__gui__Window_OnKeyDown;
 
-public enum DialogResult { cancel, yes, no, ok };
+public enum DialogResult : int64 { cancel, yes, no, ok };
 
 public class MouseButtons
 {
@@ -5303,7 +5303,7 @@ private:
       return result;
    }
 
-   bool DestroyEx(int returnCode)
+   bool DestroyEx(int64 returnCode)
    {
       OldLink slave;
       Timer timer, nextTimer;
@@ -5797,7 +5797,7 @@ private:
          if(child.cycle && !child.style.nonClient && child.style.isActiveClient && child.visible)
          {
             DataRow row = listBox.AddRow();
-            row.tag = (int)child;
+            row.tag = (int64)child;
             child.FigureCaption(caption);
             row.SetData(null, caption);
          }
@@ -6385,7 +6385,7 @@ public:
       return result;
    }
 
-   bool Destroy(int code)
+   bool Destroy(int64 code)
    {
       //if(created)
       if(this)
@@ -7486,7 +7486,7 @@ public:
    bool MenuWindowSelectWindow(MenuItem selection, Modifiers mods)
    {
       Window document;
-      int id = selection.id;
+      int64 id = selection.id;
       OldLink cycle = activeClient.cycle;
       int c = 0;
       //for(c = 0, cycle = activeChild.cycle; c<id; cycle = cycle.next, c++);
@@ -9141,7 +9141,7 @@ public:
       get { return fileName; }
    };
 
-   property int id
+   property int64 id
    {
       property_category $"Data"
       set { id = value; }
@@ -9375,7 +9375,7 @@ private:
    int numPositions;
    Menu menu;
    ScrollFlags scrollFlags;// Window Scrollbar Flags
-   int id;                 // Control ID
+   int64 id;                 // Control ID
    int documentID;
    ColorAlpha background;  // Background color used to draw the window area
    Color foreground;

diff --git a/ecere/src/gui/controls/DropBox.ec b/ecere/src/gui/controls/DropBox.ec
index dfddd2b..4b155c7 100644 (file)
--- a/ecere/src/gui/controls/DropBox.ec
+++ b/ecere/src/gui/controls/DropBox.ec
@@ -283,7 +283,7 @@ public:
    }
 
    // Convenience function using current rows
-   int GetTag()
+   int64 GetTag()
    {
       return currentRow.tag;
    }

diff --git a/ecere/src/gui/controls/ListBox.ec b/ecere/src/gui/controls/ListBox.ec
index 1bfba6e..d8a13fe 100644 (file)
--- a/ecere/src/gui/controls/ListBox.ec
+++ b/ecere/src/gui/controls/ListBox.ec
@@ -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; } };
@@ -650,7 +650,7 @@ public:
       }
    }
 
-   DataRow FindRow(int tag)
+   DataRow FindRow(int64 tag)
    {
       DataRow row = null;
       for(row = subRows.first; row; row = row.next)
@@ -661,7 +661,7 @@ public:
       return row;
    }
 
-   DataRow FindSubRow(int tag)
+   DataRow FindSubRow(int64 tag)
    {
       DataRow row = null;
       for(row = subRows.first; row; row = row.next)
@@ -942,7 +942,7 @@ private:
 
    DataRow prev, next;
    OldList cells;
-   int tag;
+   int64 tag;
    SelectedFlag selectedFlag;
    ListBox listBox;
    bool header;
@@ -1160,7 +1160,7 @@ public:
                stayOnTop = true;
                inactive = true;
                dontScrollVert = true;
-               id = (uint)addedField;
+               id = (uint64)addedField;
                text = addedField.header;
                bevel = (!guiApp.textMode && !style.clearHeader);
                ellipsis = true;
@@ -1547,7 +1547,7 @@ public:
       }
    }
 
-   DataRow FindRow(int tag)
+   DataRow FindRow(int64 tag)
    {
       if(this)
       {
@@ -1716,7 +1716,7 @@ public:
       return null;
    }
 
-   DataRow FindSubRow(int tag)
+   DataRow FindSubRow(int64 tag)
    {
       if(this)
       {
@@ -1840,7 +1840,7 @@ public:
       return (void *)currentRow.GetData(field);
    }
 
-   int GetTag()
+   int64 GetTag()
    {
       return currentRow ? currentRow.tag : 0;
    }

diff --git a/ecere/src/gui/controls/Menu.ec b/ecere/src/gui/controls/Menu.ec
index 7d3f92d..9463854 100644 (file)
--- a/ecere/src/gui/controls/Menu.ec
+++ b/ecere/src/gui/controls/Menu.ec
@@ -168,7 +168,7 @@ public:
    property bool checkable { set { checkable = value; } };
    property bool isRadio { set { radio = value; } };
 
-   property uint id { set { id = value; } get { return id; } };
+   property uint64 id { set { id = value; } get { return id; } };
    property BitmapResource bitmap
    {
       set
@@ -210,7 +210,7 @@ private:
    bool isDivider;
    bool placement;
 
-   uint id;
+   uint64 id;
    Key hotKey;
    Key accelerator;
    char * text;
@@ -402,7 +402,7 @@ public:
       }
    }
    
-   MenuItem FindItem(bool (* Window::notifySelect)(MenuItem selection, Modifiers mods), uint id)
+   MenuItem FindItem(bool (* Window::notifySelect)(MenuItem selection, Modifiers mods), uint64 id)
    {
       ItemPtr ptr;
       

diff --git a/ecere/src/gui/controls/SelectorBar.ec b/ecere/src/gui/controls/SelectorBar.ec
index 8c974f2..8d4a875 100644 (file)
--- a/ecere/src/gui/controls/SelectorBar.ec
+++ b/ecere/src/gui/controls/SelectorBar.ec
@@ -87,7 +87,7 @@ public:
       button.Destroy(0);
    }
 
-   SelectorButton FindButtonByID(int id)
+   SelectorButton FindButtonByID(int64 id)
    {
       SelectorButton button = null;
       Iterator<Window> it { controls };

diff --git a/ecere/src/gui/controls/TabControl.ec b/ecere/src/gui/controls/TabControl.ec
index f420d22..180954e 100644 (file)
--- a/ecere/src/gui/controls/TabControl.ec
+++ b/ecere/src/gui/controls/TabControl.ec
@@ -211,19 +211,19 @@ static void PlaceButton(TabButton button, TabsPlacement placement, bool selected
    {
       case top:
          button.size = selected ? { 74, 25 } : { 70, 22 };
-         button.anchor = Anchor { left = buttonsOffset + button.tab.id * 70 + 2*of, bottom = 0 };
+         button.anchor = Anchor { left = buttonsOffset + (int)button.tab.id * 70 + 2*of, bottom = 0 };
          break;
       case bottom:
          button.size = selected ? { 74, 25 } : { 70, 22 };
-         button.anchor = Anchor { left = buttonsOffset + button.tab.id * 70 + 2*of, top = 0 };
+         button.anchor = Anchor { left = buttonsOffset + (int)button.tab.id * 70 + 2*of, top = 0 };
          break;
       case left:
          button.size = selected ? { 73, 26 } : { 70, 22 };
-         button.anchor = Anchor { top = buttonsOffset + button.tab.id * 22 + 2*of, right = 0 };
+         button.anchor = Anchor { top = buttonsOffset + (int)button.tab.id * 22 + 2*of, right = 0 };
          break;
       case right:
          button.size = selected ? { 73, 26 } : { 70, 22 };
-         button.anchor = Anchor { top = buttonsOffset + button.tab.id * 22 + 2*of, left = 0 };
+         button.anchor = Anchor { top = buttonsOffset + (int)button.tab.id * 22 + 2*of, left = 0 };
          break;
    }
 }
@@ -381,7 +381,7 @@ public class TabControl : Window
       if(curButton)
       {
          Box box;
-         int id = curTab ? curTab.id : 0;
+         //int id = curTab ? (int)curTab.id : 0;
          Button button = curButton;
          int x = button.position.x;
          int y = button.position.y;
@@ -581,7 +581,7 @@ public class TabControl : Window
       {
          parent = tabButtons,
          master = this, stayDown = true,
-         text = tab.text, id = (uint)tab, NotifyClicked = NotifyClicked,
+         text = tab.text, id = (int64)tab, NotifyClicked = NotifyClicked,
          tab = tab,
          background = background;
       };
@@ -622,7 +622,7 @@ public class TabControl : Window
          if(child._class == class(TabButton))
          {
             TabButton button = (TabButton)child;
-            if(button.id == (uint)tab)
+            if(button.id == (int64)tab)
             {
                if(button.created)
                   button.Destroy(0);

diff --git a/ide/src/ProjectSettings.ec b/ide/src/ProjectSettings.ec
index d62095e..e282819 100644 (file)
--- a/ide/src/ProjectSettings.ec
+++ b/ide/src/ProjectSettings.ec
@@ -276,7 +276,7 @@ class OptionBox<class Z> : CommonControl
    }
 
    property bool visible { set { editor.visible = value; } get { return editor.visible; } }
-   property Window parent { set { editor.parent = value; Window::parent = value; master = value; editor.id = (int)this; } }
+   property Window parent { set { editor.parent = value; Window::parent = value; master = value; editor.id = (int64)this; } }
    property Point position { set { editor.position = value; } }
    property Size size { set { editor.size = value; } }
    property Anchor anchor { set { editor.anchor = value; } }
@@ -1098,7 +1098,7 @@ class DropOptionBox : OptionBox
    {
       DropBox dropBox = (DropBox)editor;
       Z value = options ? *(Z*)((byte *)options + option) : (Z)0;
-      dropBox.currentRow = value ? dropBox.FindRow((int)value) : dropBox.firstRow;
+      dropBox.currentRow = value ? dropBox.FindRow((int64)value) : dropBox.firstRow;
    }
 
    void RetrieveOption(ProjectOptions options, bool isCfgOrPlt)
@@ -1325,7 +1325,7 @@ class BuildTab : Tab
 
          button =
          {
-            configSelector, renameable = true, master = this, text = config.name, id = (int)config;
+            configSelector, renameable = true, master = this, text = config.name, id = (int64)config;
             NotifyClicked = ConfigClicked, OnRename = ConfigOnRename;
          };
 
@@ -1377,7 +1377,7 @@ class BuildTab : Tab
                   }
                }
                */
-               SelectorButton button = configSelector.FindButtonByID((int)configToDelete);
+               SelectorButton button = configSelector.FindButtonByID((int64)configToDelete);
                if(button)
                   configSelector.RemoveButton(button);
 
@@ -1581,13 +1581,13 @@ class BuildTab : Tab
          }
          else
          {
-            compilerTab.rightPaneHeader.id = (int)node;
+            compilerTab.rightPaneHeader.id = (int64)node;
             compilerTab.rightPaneHeader.Update(null);
             compilerTab.rightPaneHeader.visible = true;
          }
 
          {
-            DataRow row = compilerTab.fileList.FindSubRow((int)currentNode);
+            DataRow row = compilerTab.fileList.FindSubRow((int64)currentNode);
             if(row)
             {
                compilerTab.fileList.currentRow = row;
@@ -1662,7 +1662,7 @@ class BuildTab : Tab
       // Create Config Buttons
       commonButton = SelectorButton
       {
-         configSelector, master = this, text = $"Common", id = (int)null; font = { font.faceName, font.size, true };
+         configSelector, master = this, text = $"Common", id = (int64)null; font = { font.faceName, font.size, true };
          checked = true;
          NotifyClicked = ConfigClicked;
       };
@@ -1675,7 +1675,7 @@ class BuildTab : Tab
          {
             EditableSelectorButton button
             {
-               configSelector, master = this, renameable = true, text = c.name, id = (int)c;
+               configSelector, master = this, renameable = true, text = c.name, id = (int64)c;
                NotifyClicked = ConfigClicked, OnRename = ConfigOnRename;
             };
          }
@@ -1705,7 +1705,7 @@ class BuildTab : Tab
       {
          SelectorButton button
          {
-            platformSelector, master = this, text = p.OnGetString(0,0,0), id = (int)p; 
+            platformSelector, master = this, text = p.OnGetString(0,0,0), id = (int64)p; 
             NotifyClicked = PlatformClicked;
          };
       }
@@ -2028,7 +2028,7 @@ class CompilerTab : Tab
    {
       DataRow row = addTo ? addTo.AddRow() : fileList.AddRow();
 
-      row.tag = (int)node;
+      row.tag = (int64)node;
 
       row.SetData(null, node);
 

diff --git a/ide/src/debugger/Debugger.ec b/ide/src/debugger/Debugger.ec
index 7191268..e2ff3ed 100644 (file)
--- a/ide/src/debugger/Debugger.ec
+++ b/ide/src/debugger/Debugger.ec
@@ -1041,7 +1041,7 @@ class Debugger
       else if(expression)
       {
          wh = Watch { };
-         row.tag = (int)wh;
+         row.tag = (int64)wh;
          ide.workspace.watches.Add(wh);
          wh.row = row;
          wh.expression = CopyString(expression);

diff --git a/ide/src/designer/Sheet.ec b/ide/src/designer/Sheet.ec
index 85d5ecf..24280bd 100644 (file)
--- a/ide/src/designer/Sheet.ec
+++ b/ide/src/designer/Sheet.ec
@@ -513,7 +513,7 @@ class Sheet : Window
                for(compatible = object.compatible.first; compatible; compatible = compatible.next)
                {
                   ClassFunction function = compatible.data;
-                  MenuItem { attachMenu, function.declarator.symbol.string, id = (int)function, NotifySelect = AttachMethodSelected };
+                  MenuItem { attachMenu, function.declarator.symbol.string, id = (int64)function, NotifySelect = AttachMethodSelected };
                }
             }
          }
@@ -536,7 +536,7 @@ class Sheet : Window
                   ClassFunction function = compatible.data;
                   if(function != object.function)
                   {
-                     MenuItem { attachMenu, function.declarator.symbol.string, id = (int)function, NotifySelect = ReattachMethodSelected };
+                     MenuItem { attachMenu, function.declarator.symbol.string, id = (int64)function, NotifySelect = ReattachMethodSelected };
                   }
                }
             }
@@ -819,13 +819,13 @@ class Sheet : Window
 
                         if(clear)
                         {
-                           row = categorized ? category.row.FindRow((int)prop) : properties.FindRow((int)prop);
+                           row = categorized ? category.row.FindRow((int64)prop) : properties.FindRow((int64)prop);
                            if(!row)
                               row = categorized ? category.row.AddRow() : properties.AddRow();
-                           row.tag = (int)prop;
+                           row.tag = (int64)prop;
                         }
                         else
-                           row = categorized ? category.row.FindRow((int)prop) : properties.FindRow((int)prop);
+                           row = categorized ? category.row.FindRow((int64)prop) : properties.FindRow((int64)prop);
 
                         row.SetData(propertyName, prop.name);
                         row.SetData(propertyValue, info);
@@ -853,10 +853,10 @@ class Sheet : Window
                                     if(clear)
                                     {
                                        subRow = row.AddRow();
-                                       subRow.tag = (int)subProp;
+                                       subRow.tag = (int64)subProp;
                                     }
                                     else
-                                       subRow = row.FindRow((int)subProp);
+                                       subRow = row.FindRow((int64)subProp);
                                     
                                     subRow.SetData(propertyName, subProp.name);
                                     subRow.SetData(propertyValue, info);
@@ -869,10 +869,10 @@ class Sheet : Window
                                  if(clear)
                                  {
                                     subRow = row.AddRow();
-                                    subRow.tag = (int)member;
+                                    subRow.tag = (int64)member;
                                  }
                                  else
-                                    subRow = row.FindRow((int)member);
+                                    subRow = row.FindRow((int64)member);
 
                                  subRow.SetData(propertyName, member.name);
                                  subRow.SetData(propertyValue, info);
@@ -887,10 +887,10 @@ class Sheet : Window
                                     if(clear)
                                     {
                                        subRow = row.AddRow();
-                                       subRow.tag = (int)subMember;
+                                       subRow.tag = (int64)subMember;
                                     }
                                     else
-                                       subRow = row.FindRow((int)subMember);
+                                       subRow = row.FindRow((int64)subMember);
 
                                     subRow.SetData(propertyName, subMember.name);
                                     subRow.SetData(propertyValue, info);
@@ -925,7 +925,7 @@ class Sheet : Window
                            DataRow row;
                            char * name = prop.category ? prop.category : $"Misc";
                            Category category = categories.FindName(name, false);
-                           row = category ? (categorized ? category.row.FindRow((int)prop) : properties.FindRow((int)prop)) : null;
+                           row = category ? (categorized ? category.row.FindRow((int64)prop) : properties.FindRow((int64)prop)) : null;
                            properties.currentRow = row;
                            found = true;
                            break;                                                                                                                              
@@ -967,7 +967,7 @@ class Sheet : Window
 
       row = (DataRow)dropBox.AddRowAfter(after);
       
-      row.tag = (int)object;
+      row.tag = (int64)object;
 
       codeObject = 
       {
@@ -997,7 +997,7 @@ class Sheet : Window
 
    void DeleteObject(ObjectInfo object)
    {
-      DataRow row = dropBox.FindRow((int)object);
+      DataRow row = dropBox.FindRow((int64)object);
       if(row)
       {
          CodeObject codeObject = row.GetData(null);
@@ -1012,7 +1012,7 @@ class Sheet : Window
    {
       if(this)
       {
-         DataRow row = dropBox.FindRow((int)object);
+         DataRow row = dropBox.FindRow((int64)object);
          this.object = object ? object.instance : null;
          propertyValue.userData = object ? (void *)object.instance : null;
          dropBox.SelectRow(row);
@@ -1021,7 +1021,7 @@ class Sheet : Window
 
    void RenameObject(ObjectInfo object, char * name)
    {
-      DataRow row = dropBox.FindRow((int)object);
+      DataRow row = dropBox.FindRow((int64)object);
       CodeObject codeObject = row.GetData(null);
       // Isn't this useless? Shouldn't it be after?
       codeObject.name = name;
@@ -1254,7 +1254,7 @@ class Sheet : Window
                bitmap = { ":actions/delete.png", alphaBlend = true },
                anchor = { right = 16, top = y },
                size = { 16, h },
-               id = (int)row;
+               id = (int64)row;
 
                bool NotifyClicked(Button button, int x, int y, Modifiers mods)
                {
@@ -1307,7 +1307,7 @@ class Sheet : Window
                bitmap = { ":actions/detach.png" },
                anchor = { right = 0, top = y },
                size = { 16, h },
-               id = (int)row;
+               id = (int64)row;
 
                bool NotifyClicked(Button button, int x, int y, Modifiers mods)
                {
@@ -1333,7 +1333,7 @@ class Sheet : Window
                bitmap = { ":actions/attach.png" },
                anchor = { right = 0, top = y },
                size = { 16, h },
-               id = (int)row;
+               id = (int64)row;
 
                bool NotifyPushed(Button button, int x, int y, Modifiers mods)
                {
@@ -1348,7 +1348,7 @@ class Sheet : Window
                   for(compatible = object.compatible.first; compatible; compatible = compatible.next)
                   {
                      ClassFunction function = compatible.data;
-                     MenuItem { menu, function.declarator.symbol.string, id = (int)function, NotifySelect = AttachMethodSelected };
+                     MenuItem { menu, function.declarator.symbol.string, id = (int64)function, NotifySelect = AttachMethodSelected };
                   }
                   attachMethod = object.method;
 

diff --git a/ide/src/designer/ToolBox.ec b/ide/src/designer/ToolBox.ec
index 453fa64..34ba2b9 100644 (file)
--- a/ide/src/designer/ToolBox.ec
+++ b/ide/src/designer/ToolBox.ec
@@ -160,7 +160,7 @@ class ToolBox : Window
          anchor = Anchor { left = 5, top = *y, right = 5 };
          alignment = left;
          bitmap = { bitmapFile };
-         id = (int)id;
+         id = (int64)id;
 
          bool NotifyPushed(Button control, int x, int y, Modifiers mods)
          {

diff --git a/ide/src/dialogs/CompilersDetectionDialog.ec b/ide/src/dialogs/CompilersDetectionDialog.ec
index 75f2330..5034436 100644 (file)
--- a/ide/src/dialogs/CompilersDetectionDialog.ec
+++ b/ide/src/dialogs/CompilersDetectionDialog.ec
@@ -161,7 +161,7 @@ class CompilersDetectionDialog : Window
                if(FileExists(compilerPath).isFile)
                {
                   DataRow row = compilersList.AddString(compilerType.longName);
-                  row.tag = (int)compilerType;
+                  row.tag = (int64)compilerType;
                   // maybe try to read this line in vsvars32.bat instead of hard coded compiler names or not
                   // @echo Setting environment for using Microsoft Visual Studio 2005 x86 tools.
                }

diff --git a/ide/src/dialogs/FindInFilesDialog.ec b/ide/src/dialogs/FindInFilesDialog.ec
index 18a74b7..b6dbbed 100644 (file)
--- a/ide/src/dialogs/FindInFilesDialog.ec
+++ b/ide/src/dialogs/FindInFilesDialog.ec
@@ -143,7 +143,7 @@ public:
          DataRow row;
          sprintf(label, $"%s Project", project.name);
          row = findIn.AddString(label);
-         row.tag = (uint)project;
+         row.tag = (int64)project;
       }
    }
 
@@ -287,7 +287,7 @@ private:
          row = findWherePrjNode/*parentRow*/.AddRow();
       else
          row = findWherePrjNode.AddRow();
-      row.tag = (int)node;
+      row.tag = (int64)node;
       row.SetData(null, node);
       if(node.files)
       {
@@ -339,7 +339,7 @@ private:
 
       bool NotifySelect(DropBox control, DataRow row, Modifiers mods)
       {
-         fileFilter = row ? row.tag : 0;
+         fileFilter = (int)(row ? row.tag : 0);
          //ListFiles();
          return true;
       }

diff --git a/ide/src/dialogs/GlobalSettingsDialog.ec b/ide/src/dialogs/GlobalSettingsDialog.ec
index 92f1bc5..8b061d6 100644 (file)
--- a/ide/src/dialogs/GlobalSettingsDialog.ec
+++ b/ide/src/dialogs/GlobalSettingsDialog.ec
@@ -460,7 +460,7 @@ class CompilersTab : GlobalSettingsSubTab
             String msg = PrintString($"Are you sure you wish to delete the ", compilerToDelete.name, $" compiler configuration?");
             if(MessageBox { type = okCancel, text = title, contents = msg }.Modal() == ok)
             {
-               SelectorButton button = compilerSelector.FindButtonByID((int)compilerToDelete);
+               SelectorButton button = compilerSelector.FindButtonByID((int64)compilerToDelete);
                if(button)
                   compilerSelector.RemoveButton(button);
                //DeleteCompiler(compilerToDelete);
@@ -485,7 +485,7 @@ class CompilersTab : GlobalSettingsSubTab
       {
          SelectorButton button
          {
-            compilerSelector, master = this, text = compiler.name, id = (int)compiler;
+            compilerSelector, master = this, text = compiler.name, id = (int64)compiler;
             NotifyClicked = CompilerClicked;
          };
          selectButton = button;
@@ -494,7 +494,7 @@ class CompilersTab : GlobalSettingsSubTab
       {
          EditableSelectorButton button
          {
-            compilerSelector, master = this, renameable = true, text = compiler.name, id = (int)compiler;
+            compilerSelector, master = this, renameable = true, text = compiler.name, id = (int64)compiler;
             NotifyClicked = CompilerClicked;
 
             bool OnRename(EditableSelectorButton button, char ** oldName, char ** newName)

diff --git a/ide/src/panels/BreakpointsView.ec b/ide/src/panels/BreakpointsView.ec
index 0b86882..e00bd62 100644 (file)
--- a/ide/src/panels/BreakpointsView.ec
+++ b/ide/src/panels/BreakpointsView.ec
@@ -202,7 +202,7 @@ class BreakpointsView : Window
    {
       char string[32];
       DataRow row = listBox.AddRow();
-      row.tag = (int)bp;
+      row.tag = (int64)bp;
       bp.row = row;
       UpdateBreakpoint(row);
       ide.callStackView.Update(null);

diff --git a/ide/src/panels/CallStackView.ec b/ide/src/panels/CallStackView.ec
index 9adbc51..fda432f 100644 (file)
--- a/ide/src/panels/CallStackView.ec
+++ b/ide/src/panels/CallStackView.ec
@@ -92,11 +92,11 @@ class CallStackView : Window
 
    bool MenuEditFind(MenuItem selection, Modifiers mods)
    {
-      int id = selection.id;
+      int64 id = selection.id;
       char * searchString = findDialog.searchString;
       if(id != 2 && searchString[0])
       {
-         editBox.Find(searchString, findDialog.wholeWord, findDialog.matchCase, id);
+         editBox.Find(searchString, findDialog.wholeWord, findDialog.matchCase, (bool)id);
          return true;
       }
       findDialog.Create();

diff --git a/ide/src/panels/OutputView.ec b/ide/src/panels/OutputView.ec
index 10c4558..fd10b64 100644 (file)
--- a/ide/src/panels/OutputView.ec
+++ b/ide/src/panels/OutputView.ec
@@ -207,11 +207,11 @@ class OutputView : Window
 
    bool MenuEditFind(MenuItem selection, Modifiers mods)
    {
-      int id = selection.id;
+      int64 id = selection.id;
       char * searchString = findDialog.searchString;
       if(id != 2 && searchString[0])
       {
-         activeBox.Find(searchString, findDialog.wholeWord, findDialog.matchCase, id);
+         activeBox.Find(searchString, findDialog.wholeWord, findDialog.matchCase, (bool)id);
          return true;
       }
       findDialog.Create();

diff --git a/ide/src/panels/ThreadsView.ec b/ide/src/panels/ThreadsView.ec
index acbaff4..0a1f114 100644 (file)
--- a/ide/src/panels/ThreadsView.ec
+++ b/ide/src/panels/ThreadsView.ec
@@ -111,7 +111,7 @@ class ThreadsView : Window
 
    bool MenuEditFind(MenuItem selection, Modifiers mods)
    {
-      int id = selection.id;
+      int64 id = selection.id;
       char * searchString = findDialog.searchString;
       if(id != 2 && searchString[0])
       {

diff --git a/ide/src/panels/WatchesView.ec b/ide/src/panels/WatchesView.ec
index e3797e1..172783e 100644 (file)
--- a/ide/src/panels/WatchesView.ec
+++ b/ide/src/panels/WatchesView.ec
@@ -127,7 +127,7 @@ class WatchesView : Window
    void AddWatch(Watch wh)
    {
       DataRow row = listBox.AddRowAfter(listBox.lastRow.previous);
-      row.tag = (int)wh;
+      row.tag = (int64)wh;
       wh.row = row;
       UpdateWatch(wh);
    }

diff --git a/ide/src/project/Project.ec b/ide/src/project/Project.ec
index 97caf2d..5ffb725 100644 (file)
--- a/ide/src/project/Project.ec
+++ b/ide/src/project/Project.ec
@@ -2265,10 +2265,10 @@ private:
          bool forceBitDepth = false;
 
          Map<String, int> cflagsVariations { };
-         Map<int, int> nodeCFlagsMapping { };
+         Map<intptr, int> nodeCFlagsMapping { };
 
          Map<String, int> ecflagsVariations { };
-         Map<int, int> nodeECFlagsMapping { };
+         Map<intptr, int> nodeECFlagsMapping { };
 
          ReplaceSpaces(objDirNoSpaces, objDirExp);
          strcpy(targetDir, GetTargetDirExpression(config));

diff --git a/ide/src/project/ProjectNode.ec b/ide/src/project/ProjectNode.ec
index 59d4c2d..db79e25 100644 (file)
--- a/ide/src/project/ProjectNode.ec
+++ b/ide/src/project/ProjectNode.ec
@@ -1406,7 +1406,7 @@ private:
 
    void GenMakefilePrintSymbolRules(File f, Project project,
          ProjectConfig prjConfig, //Map<Platform, bool> parentExcludedPlatforms,
-         Map<int, int> nodeCFlagsMapping, Map<int, int> nodeECFlagsMapping)
+         Map<intptr, int> nodeCFlagsMapping, Map<intptr, int> nodeECFlagsMapping)
    {
       int ifCount = 0;
       Array<Platform> platforms = GetPlatformsArrayFromExclusionInfo(prjConfig);
@@ -1554,7 +1554,7 @@ private:
 
    void GenMakefilePrintPrepecsRules(File f, Project project,
          ProjectConfig prjConfig, /*Map<Platform, bool> parentExcludedPlatforms,*/
-         Map<int, int> nodeCFlagsMapping, Map<int, int> nodeECFlagsMapping)
+         Map<intptr, int> nodeCFlagsMapping, Map<intptr, int> nodeECFlagsMapping)
    {
       int ifCount = 0;
       ProjectConfig config = GetMatchingNodeConfig(prjConfig);
@@ -1631,7 +1631,7 @@ private:
 
    void GenMakefilePrintCObjectRules(File f, Project project,
       ProjectConfig prjConfig, /*Map<Platform, bool> parentExcludedPlatforms,*/
-      Map<int, int> nodeCFlagsMapping, Map<int, int> nodeECFlagsMapping)
+      Map<intptr, int> nodeCFlagsMapping, Map<intptr, int> nodeECFlagsMapping)
    {
       int ifCount = 0;
       ProjectConfig config = GetMatchingNodeConfig(prjConfig);
@@ -1789,7 +1789,7 @@ private:
       Map<String, NameCollisionInfo> namesInfo,
       ProjectConfig prjConfig,
       //Map<Platform, bool> parentExcludedPlatforms,
-      Map<int, int> nodeCFlagsMapping, Map<int, int> nodeECFlagsMapping)
+      Map<intptr, int> nodeCFlagsMapping, Map<intptr, int> nodeECFlagsMapping)
    {
       int ifCount = 0;
       ProjectConfig config = GetMatchingNodeConfig(prjConfig);
@@ -2041,8 +2041,8 @@ private:
    }
 
    void GenMakeCollectAssignNodeFlags(ProjectConfig prjConfig, bool prjWithEcFiles,
-         Map<String, int> cflagsVariations, Map<int, int> nodeCFlagsMapping,
-         Map<String, int> ecflagsVariations, Map<int, int> nodeECFlagsMapping,
+         Map<String, int> cflagsVariations, Map<intptr, int> nodeCFlagsMapping,
+         Map<String, int> ecflagsVariations, Map<intptr, int> nodeECFlagsMapping,
          Map<Platform, ProjectOptions> parentByPlatformOptions)
    {
       Map<Platform, ProjectOptions> byPlatformOptions = parentByPlatformOptions;
@@ -2174,8 +2174,8 @@ private:
             {
                if(isEqual)
                {
-                  nodeCFlagsMapping[(int)this] = nodeCFlagsMapping[(int)parent];
-                  nodeECFlagsMapping[(int)this] = nodeECFlagsMapping[(int)parent];
+                  nodeCFlagsMapping[(intptr)this] = nodeCFlagsMapping[(intptr)parent];
+                  nodeECFlagsMapping[(intptr)this] = nodeECFlagsMapping[(intptr)parent];
                }
                else
                {
@@ -2185,12 +2185,12 @@ private:
                   variationNum = 1;
                   if((s = cflags) && s[0] && !(variationNum = cflagsVariations[s]))
                      cflagsVariations[s] = variationNum = cflagsVariations.count;
-                  nodeCFlagsMapping[(int)this] = variationNum;
+                  nodeCFlagsMapping[(intptr)this] = variationNum;
 
                   variationNum = 1;
                   if((s = ecflags) && s[0] && !(variationNum = ecflagsVariations[s]))
                      ecflagsVariations[s] = variationNum = ecflagsVariations.count;
-                  nodeECFlagsMapping[(int)this] = variationNum;
+                  nodeECFlagsMapping[(intptr)this] = variationNum;
                }
             }
 
@@ -2201,8 +2201,8 @@ private:
          {
             // output
             {
-               nodeCFlagsMapping[(int)this] = nodeCFlagsMapping[(int)parent];
-               nodeECFlagsMapping[(int)this] = nodeECFlagsMapping[(int)parent];
+               nodeCFlagsMapping[(intptr)this] = nodeCFlagsMapping[(intptr)parent];
+               nodeECFlagsMapping[(intptr)this] = nodeECFlagsMapping[(intptr)parent];
             }
          }
 
@@ -2846,20 +2846,20 @@ static void RemovePlatformsCommonStrings(Map<String, bool> common, Array<String>
    }
 }
 
-static void GenMakePrintNodeFlagsVariable(ProjectNode node, Map<int, int> nodeFlagsMapping, String variableName, File f)
+static void GenMakePrintNodeFlagsVariable(ProjectNode node, Map<intptr, int> nodeFlagsMapping, String variableName, File f)
 {
    int customFlags;
-   customFlags = nodeFlagsMapping[(int)node];
+   customFlags = nodeFlagsMapping[(intptr)node];
    if(customFlags > 1)
       f.Printf(" $(CUSTOM%d_%s)", customFlags-1, variableName);
    else
       f.Printf(" $(%s)", variableName);
 }
 
-static void DynStringPrintNodeFlagsVariable(ProjectNode node, Map<int, int> nodeFlagsMapping, String variableName, DynamicString s)
+static void DynStringPrintNodeFlagsVariable(ProjectNode node, Map<intptr, int> nodeFlagsMapping, String variableName, DynamicString s)
 {
    int customFlags;
-   customFlags = nodeFlagsMapping[(int)node];
+   customFlags = nodeFlagsMapping[(intptr)node];
    if(customFlags > 1)
       s.concatf(" $(CUSTOM%d_%s)", customFlags-1, variableName);
    else

diff --git a/ide/src/project/ProjectView.ec b/ide/src/project/ProjectView.ec
index 6ede225..04c79ab 100644 (file)
--- a/ide/src/project/ProjectView.ec
+++ b/ide/src/project/ProjectView.ec
@@ -1602,7 +1602,7 @@ class ProjectView : Window
    {
       DataRow row = addTo ? addTo.AddRow() : fileList.AddRow();
 
-      row.tag = (int)node;
+      row.tag = (int64)node;
       node.row = row;
 
       if(node.type == resources)
@@ -1802,7 +1802,7 @@ class ProjectView : Window
             }
             Update(null);
             folderNode.row = parentNode.row.AddRowAfter(after ? after.row : null);
-            folderNode.row.tag = (int)folderNode;
+            folderNode.row.tag = (int64)folderNode;
                
             folderNode.row.SetData(null, folderNode);
             fileList.currentRow = folderNode.row;
@@ -1931,7 +1931,7 @@ class ProjectView : Window
          }
          Update(null);
          result.row = parentNode.row.AddRowAfter(after ? after.row : null);
-         result.row.tag = (int)result;
+         result.row.tag = (int64)result;
          result.row.SetData(null, result);
       }
       return result;
@@ -1973,7 +1973,7 @@ class ProjectView : Window
          Update(null);
          project.ModifiedAllConfigs(true, false, false, true);
          projectNode.row = parentNode.row.AddRowAfter(after ? after.row : null);
-         projectNode.row.tag =(int)projectNode;
+         projectNode.row.tag =(int64)projectNode;
             
          projectNode.row.SetData(null, projectNode);
          fileList.currentRow = projectNode.row;

diff --git a/ide/src/project/Workspace.ec b/ide/src/project/Workspace.ec
index 145ed3e..a840d4b 100644 (file)
--- a/ide/src/project/Workspace.ec
+++ b/ide/src/project/Workspace.ec
@@ -502,7 +502,7 @@ public:
          //  else
          //     ...
          //bp = Breakpoint { };
-         //row.tag = (int)bp;
+         //row.tag = (int64)bp;
          //breakpoints.Add(bp);
          //bp.row = row;
          Save();