--- a/mde/gui/WMScreen.d	Sat Aug 08 15:53:10 2009 +0200
+++ b/mde/gui/WMScreen.d	Mon Aug 31 13:54:23 2009 +0200
@@ -21,7 +21,7 @@
  *****************************************************************************/
 module mde.gui.WMScreen;
 
-import mde.gui.WidgetManager;
+import mde.gui.widget.WidgetManager;
 import mde.gui.WidgetLoader;
 import mde.gui.widget.Ifaces;
 
@@ -74,11 +74,11 @@
     }
     
     /** Draw the gui. */
-    void draw() {
+    override void draw() {
         synchronized(mutex) {
 	    debug (mdeDrawEvents)
 		logger.trace ("drawing");
-            wmDrawWidgets();
+            super.draw;
 	}
     }
     
@@ -109,18 +109,10 @@
      *
      * Should be called before createWidgets to prevent widgets being squashed
      * to min-dims on loading (losing saved dimensions of columns, etc). */
-    void sizeEvent (int nw, int nh) {   // IDrawable function
-        mutex.lock;
-        scope(exit) mutex.unlock;
-        
-        w = cast(wdim) nw;
-        h = cast(wdim) nh;
-        matchMinimalSize;
-        
-        if (!childRoot) return;     // if not created yet.
-        childRoot.setWidth  (w, -1);
-        childRoot.setHeight (h, -1);
-        childRoot.setPosition (0,0);
+    override void sizeEvent (int nw, int nh) {   // IDrawable function
+        synchronized (mutex) {
+	    wmSizeEvent (nw, nh);
+	}
     }
     
 protected: