fly/flightgear
1
0
Fork 0
Code Activity

Make some allowances for a dialog closing in the middle of a callback.

Browse source 
Add support for combo fields.
This commit is contained in:
david 2003-01-19 23:04:03 +00:00
parent c1d6741fd5
commit 62be29c640
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/GUI/dialog.cxx
View file

@ -20,8 +20,12 @@ action_callback (puObject * object)
GUIInfo * info = (GUIInfo *)object->getUserData(); GUIInfo * info = (GUIInfo *)object->getUserData();
NewGUI * gui = (NewGUI *)globals->get_subsystem("gui"); NewGUI * gui = (NewGUI *)globals->get_subsystem("gui");
gui->setCurrentWidget(info->widget); gui->setCurrentWidget(info->widget);
for (int i = 0; i < info->bindings.size(); i++) int nBindings = info->bindings.size();
for (int i = 0; i < nBindings; i++) {
info->bindings[i]->fire(); info->bindings[i]->fire();
if (gui->getCurrentWidget() == 0)
break;
}
gui->setCurrentWidget(0); gui->setCurrentWidget(0);
} }
@ -226,6 +230,20 @@ FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
b = new puButton(x, y, legend); b = new puButton(x, y, legend);
setupObject(b, props); setupObject(b, props);
return b; return b;
} else if (type == "combo") {
vector<SGPropertyNode_ptr> value_nodes = props->getChildren("value");
char ** entries = new char*[value_nodes.size()+1];
for (int i = 0, j = value_nodes.size() - 1;
i < value_nodes.size();
i++, j--)
entries[i] = (char *)value_nodes[i]->getStringValue();
entries[value_nodes.size()] = 0;
puComboBox * combo =
new puComboBox(x, y, x + width, y + height, entries,
props->getBoolValue("editable", false));
// delete entries;
setupObject(combo, props);
return combo;
} else { } else {
return 0; return 0;
} }