fly/flightgear
1
0
Fork 0
Code Activity

Use puAux widgets available in plib 1.8.4 instead of using pui deprecated widgets now removed from CVS

Browse source
This commit is contained in:
fredb 2006-05-14 09:03:50 +00:00
parent d9ee19d6cc
commit b30d903a56
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/GUI/dialog.cxx
View file

@ -6,6 +6,8 @@
#include <stdlib.h> // atof() #include <stdlib.h> // atof()
#include <plib/puAux.h>
#include <Input/input.hxx> #include <Input/input.hxx>
#include <Scripting/NasalSys.hxx> #include <Scripting/NasalSys.hxx>
@ -621,7 +623,7 @@ FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
} else if (type == "combo") { } else if (type == "combo") {
char ** entries = value_list(props); char ** entries = value_list(props);
puComboBox * obj = new puComboBox(x, y, x + width, y + height, entries, puaComboBox * obj = new puaComboBox(x, y, x + width, y + height, entries,
props->getBoolValue("editable", false)); props->getBoolValue("editable", false));
setupObject(obj, props); setupObject(obj, props);
#ifdef PUCOL_EDITFIELD // plib > 0.8.4 #ifdef PUCOL_EDITFIELD // plib > 0.8.4
@ -654,7 +656,7 @@ FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
} else if (type == "textbox") { } else if (type == "textbox") {
int slider_width = props->getIntValue("slider", 20); int slider_width = props->getIntValue("slider", 20);
int wrap = props->getBoolValue("wrap", true); int wrap = props->getBoolValue("wrap", true);
puLargeInput * obj = new puLargeInput(x, y, puaLargeInput * obj = new puaLargeInput(x, y,
x+width, x+height, 2, slider_width, wrap); x+width, x+height, 2, slider_width, wrap);
if (props->hasValue("editable")) { if (props->hasValue("editable")) {
@ -681,8 +683,8 @@ FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
for (unsigned int i = 0; i < value_nodes.size(); i++) for (unsigned int i = 0; i < value_nodes.size(); i++)
entries[i] = strdup((char *)value_nodes[i]->getName()); entries[i] = strdup((char *)value_nodes[i]->getName());
puSelectBox * obj = puaSelectBox * obj =
new puSelectBox(x, y, x + width, y + height, entries); new puaSelectBox(x, y, x + width, y + height, entries);
setupObject(obj, props); setupObject(obj, props);
#ifdef PUCOL_EDITFIELD // plib > 0.8.4 #ifdef PUCOL_EDITFIELD // plib > 0.8.4
setColor(obj, props, EDITFIELD); setColor(obj, props, EDITFIELD);