ecere/gui/ListBox: Added 'fixed' property to DataField to prevent resizing (Useful...

diff --git a/ecere/locale/ecere.pot b/ecere/locale/ecere.pot
index e5d5ce4..cc6e7f0 100644 (file)
--- a/ecere/locale/ecere.pot
+++ b/ecere/locale/ecere.pot
@@ -43,14 +43,14 @@ msgstr "Alt+"
 #: ./src/gui/controls/DropBox.ec:168
 #: ./src/gui/controls/EditBox.ec:739
 #: ./src/gui/controls/Label.ec:47
-#: ./src/gui/controls/ListBox.ec:981
-#: ./src/gui/controls/ListBox.ec:1014
-#: ./src/gui/controls/ListBox.ec:1015
-#: ./src/gui/controls/ListBox.ec:1019
-#: ./src/gui/controls/ListBox.ec:1047
-#: ./src/gui/controls/ListBox.ec:1048
+#: ./src/gui/controls/ListBox.ec:983
+#: ./src/gui/controls/ListBox.ec:1016
+#: ./src/gui/controls/ListBox.ec:1017
+#: ./src/gui/controls/ListBox.ec:1021
 #: ./src/gui/controls/ListBox.ec:1049
 #: ./src/gui/controls/ListBox.ec:1050
+#: ./src/gui/controls/ListBox.ec:1051
+#: ./src/gui/controls/ListBox.ec:1052
 #: ./src/gui/controls/Picture.ec:19
 #: ./src/gui/controls/Picture.ec:39
 #: ./src/gui/controls/ScrollBar.ec:82
@@ -115,17 +115,17 @@ msgstr "August"
 #: ./src/gui/controls/EditBox.ec:741
 #: ./src/gui/controls/EditBox.ec:742
 #: ./src/gui/controls/Label.ec:18
-#: ./src/gui/controls/ListBox.ec:963
-#: ./src/gui/controls/ListBox.ec:1002
-#: ./src/gui/controls/ListBox.ec:1010
-#: ./src/gui/controls/ListBox.ec:1011
+#: ./src/gui/controls/ListBox.ec:965
+#: ./src/gui/controls/ListBox.ec:1004
 #: ./src/gui/controls/ListBox.ec:1012
 #: ./src/gui/controls/ListBox.ec:1013
-#: ./src/gui/controls/ListBox.ec:1045
-#: ./src/gui/controls/ListBox.ec:1046
-#: ./src/gui/controls/ListBox.ec:1051
-#: ./src/gui/controls/ListBox.ec:1052
-#: ./src/gui/controls/ListBox.ec:1056
+#: ./src/gui/controls/ListBox.ec:1014
+#: ./src/gui/controls/ListBox.ec:1015
+#: ./src/gui/controls/ListBox.ec:1047
+#: ./src/gui/controls/ListBox.ec:1048
+#: ./src/gui/controls/ListBox.ec:1053
+#: ./src/gui/controls/ListBox.ec:1054
+#: ./src/gui/controls/ListBox.ec:1058
 #: ./src/gui/controls/ScrollBar.ec:84
 #: ./src/gui/controls/ScrollBar.ec:88
 #: ./src/gui/controls/ScrollBar.ec:99
@@ -586,7 +586,7 @@ msgid "Please enter a name."
 msgstr "Please enter a name."
 
 #: ./src/gui/controls/DropBox.ec:98
-#: ./src/gui/controls/ListBox.ec:964
+#: ./src/gui/controls/ListBox.ec:966
 msgid "Private"
 msgstr "Private"
 

diff --git a/ecere/src/gui/controls/ListBox.ec b/ecere/src/gui/controls/ListBox.ec
index 5f63dc6..615c80a 100644 (file)
--- a/ecere/src/gui/controls/ListBox.ec
+++ b/ecere/src/gui/controls/ListBox.ec
@@ -61,6 +61,7 @@ public:
       get { return dataType; }
    }
    property bool editable { set { editable = value; } };
+   property bool fixed { set { fixed = value; } get { return fixed; } };
    property Alignment alignment
    {
       set
@@ -244,6 +245,7 @@ private:
    bool defaultField;
    void * userData;
    bool freeData;
+   bool fixed;
 };
 
 public class DataRow
@@ -2713,6 +2715,7 @@ private:
          else if(x < RESIZE_BORDER && field.prev)
             field = field.prev;
 
+         if(field.fixed) return false;
          resizingField = field;
          this.resizeX = x + control.position.x;
          this.startWidth = field.width;
@@ -2721,6 +2724,7 @@ private:
       }
       else if(field)
       {
+         if(field.fixed) return false;
          draggingField = field;
          if(style.moveFields)
             field.headButton.stayDown = true;
@@ -2816,7 +2820,10 @@ private:
          if(field)
          {
             if(x < RESIZE_BORDER && field.prev)
-               control.cursor = guiApp.GetCursor(sizeWE);
+            {
+               if(!field.prev.fixed)
+                  control.cursor = guiApp.GetCursor(sizeWE);
+            }
             else if(x >= control.clientSize.w - RESIZE_BORDER)
                control.cursor = guiApp.GetCursor(sizeWE);
             else