From: mfranz <mfranz>
Date: Sun, 6 Nov 2005 14:27:17 +0000 (+0000)
Subject: backing out all changes to non-depreciated symbols/functions: plib's cvs
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=63f5947afc3646f4fafaa1b546dc9d1724eba44a;p=flightgear.git

backing out all changes to non-depreciated symbols/functions: plib's cvs
isn't tagged, so we can't easily say what was added after the last stable
release
---

diff --git a/src/GUI/dialog.cxx b/src/GUI/dialog.cxx
index 28f60ad61..f7a38649d 100644
--- a/src/GUI/dialog.cxx
+++ b/src/GUI/dialog.cxx
@@ -578,7 +578,7 @@ FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
              i < value_nodes.size();
              i++, j--)
             entries[i] = strdup((char *)value_nodes[i]->getStringValue());
-        puaComboBox * obj = new puaComboBox(x, y, x + width, y + height, entries,
+        puComboBox * obj = new puComboBox(x, y, x + width, y + height, entries,
                            props->getBoolValue("editable", false));
         setupObject(obj, props);
         setColor(obj, props, FOREGROUND|LABEL);
@@ -608,7 +608,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;
-        puaLargeInput * obj = new puaLargeInput(x, y,
+        puLargeInput * obj = new puLargeInput(x, y,
                 x+width, x+height, 2, slider_width, wrap);
 
         if (props->hasValue("editable")) {
@@ -634,8 +634,8 @@ FGDialog::makeObject (SGPropertyNode * props, int parentWidth, int parentHeight)
              i < value_nodes.size();
              i++, j--)
             entries[i] = strdup((char *)value_nodes[i]->getName());
-        puaSelectBox * obj =
-            new puaSelectBox(x, y, x + width, y + height, entries);
+        puSelectBox * obj =
+            new puSelectBox(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 5242c7854..452334973 100644
--- a/src/GUI/dialog.hxx
+++ b/src/GUI/dialog.hxx
@@ -7,7 +7,7 @@
 # error This library requires C++
 #endif
 
-#include <plib/puAux.h>
+#include <plib/pu.h>
 #include <plib/sg.h>
 
 #include <simgear/compiler.h>	// for SG_USING_STD