]> git.mxchange.org Git - flightgear.git/commitdiff
switch from depreciated pui functions to the "new", supported ones
authormfranz <mfranz>
Sat, 5 Nov 2005 09:51:01 +0000 (09:51 +0000)
committermfranz <mfranz>
Sat, 5 Nov 2005 09:51:01 +0000 (09:51 +0000)
(OK'ed by Curt)

src/GUI/dialog.cxx
src/GUI/dialog.hxx
src/Main/Makefile.am

index f9f324e58b4c1e545bc8d47ff4532470ef52dac1..406cdfa843238cfb550e485170deccb453b41afe 100644 (file)
@@ -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;
index 26b89bb96566aff10e6f9de377be3b278b4abfba..43f425aefbc7269469f2658041bcabca6d17af16 100644 (file)
@@ -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
index 4efa4deaf0f5a5dbde8da79939c3396b4e640459..1b670120a6297da4ecd3605c5ec40c97c1b89dce 100644 (file)
@@ -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) \