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/Autopilot/auto_gui.cxx b/src/Autopilot/auto_gui.cxx
index 21a435513b51080c371e2cf58d211cf904f0f208..e7ae0a45dc032fc1c1952674ed0b2b474151667e 100644 (file)
--- a/src/Autopilot/auto_gui.cxx
+++ b/src/Autopilot/auto_gui.cxx
@@ -852,7 +852,7 @@ void NewTgtAirportInit()
         
         TgtAptDialogWPList = new puListBox ( 50, 130, 300, 320 ) ;
         TgtAptDialogWPList -> setLabel ( "Flight Plan" );
-        TgtAptDialogWPList -> setLabelPlace ( PUPLACE_TOP_LEFT ) ;
+        TgtAptDialogWPList -> setLabelPlace ( PUPLACE_ABOVE ) ;
         TgtAptDialogWPList -> setStyle ( -PUSTYLE_SMALL_SHADED ) ;
         TgtAptDialogWPList -> setValue ( 0 ) ;
 
@@ -872,7 +872,7 @@ void NewTgtAirportInit()
 
         TgtAptDialogInput   = new puInput           (50, 70, 300, 100);
         TgtAptDialogInput -> setLabel ( NewTgtAirportLabel );
-        TgtAptDialogInput -> setLabelPlace ( PUPLACE_TOP_LEFT ) ;
+        TgtAptDialogInput -> setLabelPlace ( PUPLACE_ABOVE ) ;
         TgtAptDialogInput   ->    setValue          (NewTgtAirportId);
         TgtAptDialogInput   ->    acceptInput();
         

diff --git a/src/GUI/prop_picker.cxx b/src/GUI/prop_picker.cxx
index 950a9b80c2dd09545e99eee62c84d6c7c0aa746c..a2b4de8519b9fdc9d5e4e6883a32a8ce6e59730c 100755 (executable)
--- a/src/GUI/prop_picker.cxx
+++ b/src/GUI/prop_picker.cxx
@@ -379,7 +379,7 @@ fgPropPicker::fgPropPicker ( int x, int y, int w, int h, int arrows,
   
   list_box = new puListBox ( 10, 40, w-40, h-60 ) ;
   list_box -> setLabel ( title );
-  list_box -> setLabelPlace ( PUPLACE_TOP_LEFT ) ;
+  list_box -> setLabelPlace ( PUPLACE_ABOVE ) ;
   list_box -> setStyle ( -PUSTYLE_SMALL_SHADED ) ;
   list_box -> setUserData ( this ) ;
   list_box -> setCallback ( handle_select ) ;

diff --git a/src/GUI/puList.hxx b/src/GUI/puList.hxx
index c92d40a8b8b16a24ca8611cd5bdc8d351dc56e89..2b4946a002751518c57845e75fffef11185ecb29 100644 (file)
--- a/src/GUI/puList.hxx
+++ b/src/GUI/puList.hxx
@@ -7,9 +7,9 @@
 #  include <config.h>
 #endif
 
-#include <plib/puAux.h>
+#include <plib/pu.h>
 
-//# define PUCLASS_LIST   0x80000000  // Hopefully this value will never be used by plib
+# define PUCLASS_LIST   0x80000000  // Hopefully this value will never be used by plib
 
 /**
  * A scrolling list for PUI.

diff --git a/src/GUI/sgVec3Slider.cxx b/src/GUI/sgVec3Slider.cxx
index 3e2b40db00d347d36fd5ad9e7d82fcd423859749..454c7082e27749e3ff52d3885f64cf83c5b66871 100644 (file)
--- a/src/GUI/sgVec3Slider.cxx
+++ b/src/GUI/sgVec3Slider.cxx
@@ -129,9 +129,9 @@ FloatSlider::FloatSlider ( int x, int y, int sz, float f, const char *title,
        setCBMode   ( PUSLIDER_DELTA ) ;
        strcpy      ( _title, title);
        setLabel    ( _title );
-       setLabelPlace ( PUPLACE_LOWER_LEFT );
+       setLabelPlace ( PUPLACE_LEFT );
        setLegend(_text);
-       // setLegendPlace( PUPLACE_LOWER_RIGHT );
+       // setLegendPlace( PUPLACE_RIGHT );
 }
 
 
@@ -211,9 +211,9 @@ FloatDial::FloatDial ( int x, int y, int sz, float f, const char *title,
        setCBMode   ( PUSLIDER_DELTA ) ;
        strcpy      ( _title, title);
        setLabel    ( _title );
-       setLabelPlace ( PUPLACE_LOWER_LEFT  );
+       setLabelPlace ( PUPLACE_LEFT  );
        setLegend(_text);
-       // setLegendPlace( PUPLACE_LOWER_RIGHT );
+       // setLegendPlace( PUPLACE_RIGHT );
 }
 
 
@@ -329,7 +329,7 @@ sgVec3Slider::sgVec3Slider ( int x, int y, sgVec3 cart, const char *title,
 
        new puFrame ( 0, 0, DialogWidth, DialogHeight );
 
-       setLabelPlace( PUPLACE_DEFAULT /*PUPLACE_CENTERED_CENTERED*/ );
+       setLabelPlace( PUPLACE_DEFAULT /*PUPLACE_CENTERED*/ );
        setLabel( Label );
 
         /* heading */

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 1b670120a6297da4ecd3605c5ec40c97c1b89dce..4efa4deaf0f5a5dbde8da79939c3396b4e640459 100644 (file)
--- 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) \
-       -lplibpuaux -lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \
+       -lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \
        $(network_LIBS) \
        -lz \
        $(opengl_LIBS) \