From d4b8a81a445e63f9853f7a08e4febd7c2fa51d65 Mon Sep 17 00:00:00 2001 From: ehofman Date: Mon, 16 May 2005 08:37:18 +0000 Subject: [PATCH] Make the dialogs work again. --- src/GUI/dialog.cxx | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/GUI/dialog.cxx b/src/GUI/dialog.cxx index 0a70deab5..6e9227104 100644 --- a/src/GUI/dialog.cxx +++ b/src/GUI/dialog.cxx @@ -359,10 +359,10 @@ FGDialog::display (SGPropertyNode * props) int screenw = globals->get_props()->getIntValue("/sim/startup/xsize"); int screenh = globals->get_props()->getIntValue("/sim/startup/ysize"); - bool userx = props->hasValue("x"); - bool usery = props->hasValue("y"); - bool userw = props->hasValue("width"); - bool userh = props->hasValue("height"); + // bool userx = props->hasValue("x"); + // bool usery = props->hasValue("y"); + // bool userw = props->hasValue("width"); + // bool userh = props->hasValue("height"); LayoutWidget wid(props); int pw=0, ph=0; @@ -377,11 +377,13 @@ FGDialog::display (SGPropertyNode * props) _object = makeObject(props, screenw, screenh); // Remove automatically generated properties, so the layout looks + // EMH - this isn't needed anymore since the layout remains in + // the poprty tree now. // the same next time around. - if(!userx) props->removeChild("x"); - if(!usery) props->removeChild("y"); - if(!userw) props->removeChild("width"); - if(!userh) props->removeChild("height"); + // if(!userx) props->removeChild("x"); + // if(!usery) props->removeChild("y"); + // if(!userw) props->removeChild("width"); + // if(!userh) props->removeChild("height"); if (_object != 0) { _object->reveal();