switch from depreciated pui functions to the "new", supported ones
(OK'ed by Curt)
This commit is contained in:
parent
533201c7a0
commit
e7d2718e15
3 changed files with 6 additions and 6 deletions
|
@ -572,7 +572,7 @@ FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
|
|||
i < value_nodes.size();
|
||||
i++, j--)
|
||||
entries[i] = strdup((char *)value_nodes[i]->getStringValue());
|
||||
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));
|
||||
setupObject(obj, props);
|
||||
setColor(obj, props, FOREGROUND|LABEL);
|
||||
|
@ -602,7 +602,7 @@ FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
|
|||
int slider_width = props->getIntValue("slider", parentHeight);
|
||||
int wrap = props->getBoolValue("wrap", true);
|
||||
if (slider_width==0) slider_width=20;
|
||||
puLargeInput * obj = new puLargeInput(x, y,
|
||||
puaLargeInput * obj = new puaLargeInput(x, y,
|
||||
x+width, x+height, 2, slider_width, wrap);
|
||||
|
||||
if (props->hasValue("editable")) {
|
||||
|
@ -628,8 +628,8 @@ FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
|
|||
i < value_nodes.size();
|
||||
i++, j--)
|
||||
entries[i] = strdup((char *)value_nodes[i]->getName());
|
||||
puSelectBox * obj =
|
||||
new puSelectBox(x, y, x + width, y + height, entries);
|
||||
puaSelectBox * obj =
|
||||
new puaSelectBox(x, y, x + width, y + height, entries);
|
||||
setupObject(obj, props);
|
||||
setColor(obj, props, FOREGROUND|LABEL);
|
||||
return obj;
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
# error This library requires C++
|
||||
#endif
|
||||
|
||||
#include <plib/pu.h>
|
||||
#include <plib/puAux.h>
|
||||
#include <plib/sg.h>
|
||||
|
||||
#include <simgear/compiler.h> // for SG_USING_STD
|
||||
|
|
|
@ -91,7 +91,7 @@ fgfs_LDADD = \
|
|||
-lsgmagvar -lsgmisc -lsgnasal -lsgxml -lsgsound -lsgserial \
|
||||
-lsgstructure -lsgenvironment \
|
||||
$(THREAD_LIBS) \
|
||||
-lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \
|
||||
-lplibpuaux -lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \
|
||||
$(network_LIBS) \
|
||||
-lz \
|
||||
$(opengl_LIBS) \
|
||||
|
|
Loading…
Reference in a new issue