From: mfranz <mfranz>
Date: Sat, 5 Nov 2005 09:51:01 +0000 (+0000)
Subject: switch from depreciated pui functions to the "new", supported ones
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e7d2718e15111919872c02b6deb547be2ec03d05;p=flightgear.git

switch from depreciated pui functions to the "new", supported ones
(OK'ed by Curt)
---

diff --git a/src/GUI/dialog.cxx b/src/GUI/dialog.cxx
index f9f324e58..406cdfa84 100644
--- a/src/GUI/dialog.cxx
+++ b/src/GUI/dialog.cxx
@@ -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;
diff --git a/src/GUI/dialog.hxx b/src/GUI/dialog.hxx
index 26b89bb96..43f425aef 100644
--- a/src/GUI/dialog.hxx
+++ b/src/GUI/dialog.hxx
@@ -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
diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 4efa4deaf..1b670120a 100644
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -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) \