fly/flightgear
1
0
Fork 0
Code Activity

switch from depreciated pui functions to the "new", supported ones

Browse source 
(OK'ed by Curt)
This commit is contained in:
mfranz 2005-11-05 09:51:01 +00:00
parent 533201c7a0
commit e7d2718e15
3 changed files with 6 additions and 6 deletions

8
src/GUI/dialog.cxx
View file

@ -572,7 +572,7 @@ FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
i < value_nodes.size(); i < value_nodes.size();
i++, j--) i++, j--)
entries[i] = strdup((char *)value_nodes[i]->getStringValue()); 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)); props->getBoolValue("editable", false));
setupObject(obj, props); setupObject(obj, props);
setColor(obj, props, FOREGROUND|LABEL); 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 slider_width = props->getIntValue("slider", parentHeight);
int wrap = props->getBoolValue("wrap", true); int wrap = props->getBoolValue("wrap", true);
if (slider_width==0) slider_width=20; 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); x+width, x+height, 2, slider_width, wrap);
if (props->hasValue("editable")) { if (props->hasValue("editable")) {
@ -628,8 +628,8 @@ FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
i < value_nodes.size(); i < value_nodes.size();
i++, j--) i++, j--)
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);
setColor(obj, props, FOREGROUND|LABEL); setColor(obj, props, FOREGROUND|LABEL);
return obj; return obj;

2
src/GUI/dialog.hxx
View file

@ -7,7 +7,7 @@
# error This library requires C++ # error This library requires C++
#endif #endif
#include <plib/pu.h> #include <plib/puAux.h>
#include <plib/sg.h> #include <plib/sg.h>
#include <simgear/compiler.h> // for SG_USING_STD #include <simgear/compiler.h> // for SG_USING_STD

2
src/Main/Makefile.am
View file

@ -91,7 +91,7 @@ fgfs_LDADD = \
-lsgmagvar -lsgmisc -lsgnasal -lsgxml -lsgsound -lsgserial \ -lsgmagvar -lsgmisc -lsgnasal -lsgxml -lsgsound -lsgserial \
-lsgstructure -lsgenvironment \ -lsgstructure -lsgenvironment \
$(THREAD_LIBS) \ $(THREAD_LIBS) \
-lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \ -lplibpuaux -lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \
$(network_LIBS) \ $(network_LIBS) \
-lz \ -lz \
$(opengl_LIBS) \ $(opengl_LIBS) \