diff mde/gui/WidgetManager.d @ 132:264028f4115a

Cleaned up mde.imde and a couple of widget functions. New mde.menus module to add default menus. The input singleton is now created in mde.input.Input instead of mde.imde.
author Diggory Hardy <diggory.hardy@gmail.com>
date Fri, 23 Jan 2009 14:59:05 +0000
parents 9cff74f68b84
children 9fd705793568
line wrap: on
line diff
--- a/mde/gui/WidgetManager.d	Wed Jan 21 13:01:40 2009 +0000
+++ b/mde/gui/WidgetManager.d	Fri Jan 23 14:59:05 2009 +0000
@@ -34,6 +34,7 @@
 import Items = mde.content.Items;	// loadTranslation
 debug import mde.content.miscContent;	// Debug menu
 
+import mt = mde.file.mergetag.DataSet;
 import mde.file.mergetag.Reader;
 import mde.file.mergetag.Writer;
 import mde.setup.paths;
@@ -80,7 +81,7 @@
         debug {
             auto lWS = new EventContent ("logWidgetSize");
             lWS.addCallback (&logWidgetSize);
-            imde.menu.append (lWS);
+            imde.menus.append (new ContentList ("debug", [cast(Content)lWS]));
         }
     }
     
@@ -492,8 +493,7 @@
     // content functions: 0x30
     editContent		= FUNCTION | TAKES_CONTENT | SAFE_RECURSION | 0x30,
     addContent		= FUNCTION | 0x31,
-    flatMenuContent	= FUNCTION | TAKES_CONTENT | SAFE_RECURSION | 0x32,
-    subMenuContent	= FUNCTION | TAKES_CONTENT | 0x33,
+    popupListContent	= FUNCTION | TAKES_CONTENT | 0x33,
     
     // content widgets: 0x40
     DisplayContent	= TAKES_CONTENT | 0x40,
@@ -524,10 +524,9 @@
 	"GridLayout",
 	"FloatingArea",
 	"Switch",
-	"subMenuContent",
+	"popupListContent",
 	"ContentList",
-	"editContent",
-	"flatMenuContent"];
+	"editContent"];
 
 /* Generates a binary search algorithm for makeWidget. */
 char[] binarySearch (char[] var, char[][] consts) {