Mercurial > hg > toolkit / file diff

--- a/ui/wpf/UIcore/Window.cs	Sat Jan 31 11:51:54 2015 +0100
+++ b/ui/wpf/UIcore/Window.cs	Sun Feb 01 10:35:07 2015 +0100
@@ -25,13 +25,12 @@
             ColumnDefinition column = new ColumnDefinition();
             column.Width = new GridLength(1, GridUnitType.Star);
             windowGrid.ColumnDefinitions.Add(column);
-
-            AddChild(windowGrid);
+            this.AddChild(windowGrid);
             int rowIndex = 0;
 
             // menu
             Application app = Application.GetInstance();
-            if (!app.AppMenu.IsEmpty())
+            if (!app.AppMenu.IsEmpty() && false)
             {
                 System.Windows.Controls.Menu menu = app.AppMenu.CreateMenu(uiobj);
 
@@ -51,13 +50,13 @@
             RowDefinition contentRow = new RowDefinition();
             contentRow.Height = new GridLength(1, GridUnitType.Star);
             windowGrid.RowDefinitions.Add(contentRow);
-            Grid content = new Grid();
-            Grid.SetColumn(content, 0);
-            Grid.SetRow(content, rowIndex);
-            windowGrid.Children.Add(content);
+            BoxContainer vbox = new BoxContainer(BoxOrientation.VERTICAL);
+            Grid.SetColumn(vbox, 0);
+            Grid.SetRow(vbox, rowIndex);
+            windowGrid.Children.Add(vbox);
             rowIndex++;
 
-            Container = new BoxContainer(content, BoxOrientation.VERTICAL);
+            Container = vbox;
 
             Closed += CloseEvent;
         }