--- a/mde/gui/widget/Window.d	Mon Jul 07 15:53:58 2008 +0100
+++ b/mde/gui/widget/Window.d	Mon Jul 07 15:54:47 2008 +0100
@@ -100,22 +100,22 @@
     //BEGIN Mergetag code
     void addTag (char[] tp, mt.ID id, char[] dt) {
         // Priority is HIGH_LOW, so don't overwrite data which has already been loaded.
-        if (tp == INTAINT) {
-            if (id == WDGD && widgetData == null) {
+        if (tp == "int[][int]") {
+            if (id == "widgetData" && widgetData == null) {
                 widgetData = cast(int[][widgetID]) parseTo!(int[][int]) (dt);
             }
-        } else if (tp == CHARAINT) {
-            if (id == WS && widgetStrings == null) {
+        } else if (tp == "char[][int]") {
+            if (id == "widgetStrings" && widgetStrings == null) {
                 widgetStrings = parseTo!(char[][int]) (dt);
             }
-        } else if (tp == INTA) {
-            if (id == MD && mutableData == null) {
+        } else if (tp == "int[]") {
+            if (id == "mutableData" && mutableData == null) {
                 mutableData = parseTo!(int[]) (dt);
             }
-        } else if (tp == INT) {
-            if (id == X && x == -1) {
+        } else if (tp == "int") {
+            if (id == "x" && x == -1) {
                 x = cast(wdim) parseTo!(int) (dt);
-            } else if (id == Y && y == -1) {
+            } else if (id == "y" && y == -1) {
                 y = cast(wdim) parseTo!(int) (dt);
             }
         }
@@ -127,25 +127,14 @@
         /+ NOTE: currently editing is impossible...
         if (edited) {   // only save the widget creation data if it's been adjusted:
             addCreationData (widget);   // generate widget save data
-            dlg (INTAINT, WDGD, parseFrom!(int[][int]) (widgetData));
-            dlg (CHARAINT, WS, parseFrom!(char[][int]) (widgetStrings));
+            dlg ("int[][int]", "widgetData", parseFrom!(int[][int]) (widgetData));
+            dlg ("char[][int]", "widgetStrings", parseFrom!(char[][int]) (widgetStrings));
         }+/
         // Save mutable data:
-        dlg (INTA, MD, parseFrom!(int[]) (widget.getMutableData));
+        dlg ("int[]", "mutableData", parseFrom!(int[]) (widget.getMutableData));
         // Save the window position:
-        dlg (INT, X, parseFrom!(int) (x));
-        dlg (INT, Y, parseFrom!(int) (y));
-    }
-    private static const {
-        auto CHARAINT = "char[][int]";
-        auto INTAINT = "int[][int]";
-        auto INTA = "int[]";
-        auto INT = "int";
-        auto WDGD = "widgetData";
-        auto MD = "mutableData";
-        auto WS = "widgetStrings";
-        auto X = "x";
-        auto Y = "y";
+        dlg ("int", "x", parseFrom!(int) (x));
+        dlg ("int", "y", parseFrom!(int) (y));
     }
     //END Mergetag code
     //END Methods for GUI