ecere/eda: Fixed some build warnings

diff --git a/ecere/src/com/dataTypes.ec b/ecere/src/com/dataTypes.ec
index 62bca1c..9508779 100644 (file)
--- a/ecere/src/com/dataTypes.ec
+++ b/ecere/src/com/dataTypes.ec
@@ -63,7 +63,6 @@ static void UnusedFunction()
    a.OnCompare(null);
    a.OnSaveEdit(null,0);
    a.OnEdit(null,null,0,0,0,20,0);
-   a.OnDisplay(null,0,0,0,0,0,0);
    a.OnGetDataFromString(null);
 }
 

diff --git a/ecere/src/gfx/bitmaps/JPEGFormat.ec b/ecere/src/gfx/bitmaps/JPEGFormat.ec
index 43617f7..49f849c 100644 (file)
--- a/ecere/src/gfx/bitmaps/JPEGFormat.ec
+++ b/ecere/src/gfx/bitmaps/JPEGFormat.ec
@@ -148,7 +148,7 @@ static boolean JPEG_EmptyOutputBuffer(j_compress_ptr cinfo)
 static void JPEG_TermDestination(j_compress_ptr cinfo)
 {
    DestinationManager * dest = (DestinationManager *) cinfo->dest;
-   uint datacount = OUTPUT_BUF_SIZE - dest->pub.free_in_buffer;
+   uint datacount = (uint)(OUTPUT_BUF_SIZE - dest->pub.free_in_buffer);
    
    if (datacount > 0)
    {

diff --git a/ecere/src/gui/dialogs/FileDialog.ec b/ecere/src/gui/dialogs/FileDialog.ec
index 66ff7d7..93e8f18 100644 (file)
--- a/ecere/src/gui/dialogs/FileDialog.ec
+++ b/ecere/src/gui/dialogs/FileDialog.ec
@@ -1171,7 +1171,7 @@ private:
       
       bool NotifySelect(DropBox control, DataRow row, Modifiers mods)
       {
-         fileFilter = row ? row.tag : 0;
+         fileFilter = (int)(row ? row.tag : 0);
          ListFiles();
          return true;
       }
@@ -1190,7 +1190,7 @@ private:
       bool NotifySelect(DropBox control, DataRow row, Modifiers mods)
       {
          char * selectedFileName = null;
-         fileType = row ? row.tag : 0;
+         fileType = (int)(row ? row.tag : 0);
          if(style == save && types && types[fileType].typeExtension)
          {
             if(getNameFromListBox)

diff --git a/eda/libeda/src/gui.ec b/eda/libeda/src/gui.ec
index fd46e71..58382c4 100644 (file)
--- a/eda/libeda/src/gui.ec
+++ b/eda/libeda/src/gui.ec
@@ -875,14 +875,14 @@ public class ListSection : Group
       }
    };
 
-   public virtual void Window::NotifySelectListRow(ListSection listSection, uint id);
+   public virtual void Window::NotifySelectListRow(ListSection listSection, uint64 id);
    
    public void SelectListRow(DataRow row)
    {
       // Time startTime = GetTime();
       if(row)
       {
-         uint id = row.tag;
+         uint64 id = row.tag;
          lastRow = row;
 
          if(list.currentRow != row)

diff --git a/eda/libeda/src/gui/TableEditor.ec b/eda/libeda/src/gui/TableEditor.ec
index c6caba8..79d6186 100644 (file)
--- a/eda/libeda/src/gui/TableEditor.ec
+++ b/eda/libeda/src/gui/TableEditor.ec
@@ -824,7 +824,8 @@ public:
       DebugLn("TableEditor::SelectListRow");
       if(row)
       {
-         selectedId = row.tag;
+         // TOFIX: Id is still 32-bit; Also the warning without this cast seems wrong (It says row.tag is of type eda::Id, while it is int64)
+         selectedId = (Id)row.tag;
          lastRow = row;
 
          if(list.currentRow != row)

diff --git a/eda/libeda/src/idList.ec b/eda/libeda/src/idList.ec
index 9da121d..f891bce 100644 (file)
--- a/eda/libeda/src/idList.ec
+++ b/eda/libeda/src/idList.ec
@@ -68,7 +68,8 @@ public class Id : uint
 
                bool DataBox::NotifySelect(DropBox control, DataRow row, Modifiers mods)
                {
-                  uint id = row ? row.tag : 0;
+                  // TOFIX: Id is still 32 bit
+                  uint id = (uint)(row ? row.tag : 0);
                   SetData(&id, mods.closingDropDown);
                   return true;
                }