fly/flightgear
1
0
Fork 0
Code Activity

backing out all changes to non-depreciated symbols/functions: plib's cvs

Browse source 
isn't tagged, so we can't easily say what was added after the last stable
release
This commit is contained in:
mfranz 2005-11-06 14:22:02 +00:00
parent 2aceb0e63f
commit 47f90a7976
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Autopilot/auto_gui.cxx
View file

@ -852,7 +852,7 @@ void NewTgtAirportInit()
TgtAptDialogWPList = new puListBox ( 50, 130, 300, 320 ) ; TgtAptDialogWPList = new puListBox ( 50, 130, 300, 320 ) ;
TgtAptDialogWPList -> setLabel ( "Flight Plan" ); TgtAptDialogWPList -> setLabel ( "Flight Plan" );
TgtAptDialogWPList -> setLabelPlace ( PUPLACE_TOP_LEFT ) ; TgtAptDialogWPList -> setLabelPlace ( PUPLACE_ABOVE ) ;
TgtAptDialogWPList -> setStyle ( -PUSTYLE_SMALL_SHADED ) ; TgtAptDialogWPList -> setStyle ( -PUSTYLE_SMALL_SHADED ) ;
TgtAptDialogWPList -> setValue ( 0 ) ; TgtAptDialogWPList -> setValue ( 0 ) ;
@ -872,7 +872,7 @@ void NewTgtAirportInit()
TgtAptDialogInput = new puInput (50, 70, 300, 100); TgtAptDialogInput = new puInput (50, 70, 300, 100);
TgtAptDialogInput -> setLabel ( NewTgtAirportLabel ); TgtAptDialogInput -> setLabel ( NewTgtAirportLabel );
TgtAptDialogInput -> setLabelPlace ( PUPLACE_TOP_LEFT ) ; TgtAptDialogInput -> setLabelPlace ( PUPLACE_ABOVE ) ;
TgtAptDialogInput -> setValue (NewTgtAirportId); TgtAptDialogInput -> setValue (NewTgtAirportId);
TgtAptDialogInput -> acceptInput(); TgtAptDialogInput -> acceptInput();

2
src/GUI/prop_picker.cxx
View file

@ -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 = new puListBox ( 10, 40, w-40, h-60 ) ;
list_box -> setLabel ( title ); list_box -> setLabel ( title );
list_box -> setLabelPlace ( PUPLACE_TOP_LEFT ) ; list_box -> setLabelPlace ( PUPLACE_ABOVE ) ;
list_box -> setStyle ( -PUSTYLE_SMALL_SHADED ) ; list_box -> setStyle ( -PUSTYLE_SMALL_SHADED ) ;
list_box -> setUserData ( this ) ; list_box -> setUserData ( this ) ;
list_box -> setCallback ( handle_select ) ; list_box -> setCallback ( handle_select ) ;

4
src/GUI/puList.hxx
View file

@ -7,9 +7,9 @@
# include <config.h> # include <config.h>
#endif #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. * A scrolling list for PUI.

10
src/GUI/sgVec3Slider.cxx
View file

@ -129,9 +129,9 @@ FloatSlider::FloatSlider ( int x, int y, int sz, float f, const char *title,
setCBMode ( PUSLIDER_DELTA ) ; setCBMode ( PUSLIDER_DELTA ) ;
strcpy ( _title, title); strcpy ( _title, title);
setLabel ( _title ); setLabel ( _title );
setLabelPlace ( PUPLACE_LOWER_LEFT ); setLabelPlace ( PUPLACE_LEFT );
setLegend(_text); 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 ) ; setCBMode ( PUSLIDER_DELTA ) ;
strcpy ( _title, title); strcpy ( _title, title);
setLabel ( _title ); setLabel ( _title );
setLabelPlace ( PUPLACE_LOWER_LEFT ); setLabelPlace ( PUPLACE_LEFT );
setLegend(_text); 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 ); new puFrame ( 0, 0, DialogWidth, DialogHeight );
setLabelPlace( PUPLACE_DEFAULT /*PUPLACE_CENTERED_CENTERED*/ ); setLabelPlace( PUPLACE_DEFAULT /*PUPLACE_CENTERED*/ );
setLabel( Label ); setLabel( Label );
/* heading */ /* heading */

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) \
-lplibpuaux -lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \ -lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \
$(network_LIBS) \ $(network_LIBS) \
-lz \ -lz \
$(opengl_LIBS) \ $(opengl_LIBS) \