plib-cvs

[Sebastian U. <ud...@us...>]

Update of /cvsroot/plib/plib/examples/src/pui
In directory usw-pr-cvs1:/tmp/cvs-serv10824

Modified Files:
	PointPicker.cxx complex.cxx widget_list.cxx 
Log Message:
Changed to use default PUI fonts; Made some stuff "static"

Index: PointPicker.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/pui/PointPicker.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- PointPicker.cxx	30 Aug 2002 21:11:21 -0000	1.13
+++ PointPicker.cxx	31 Aug 2002 14:55:16 -0000	1.14
@@ -37,17 +37,17 @@
 *                                   *
 \***********************************/
 
-int           main_window ;
-puText       *instruction ;
-puInput      *point_no    ;
-puOneShot    *move_point  ;
-puButton     *exit_button ;
-puLargeInput *input ;
+static int           main_window ;
+static puText       *instruction ;
[...87 lines suppressed...]
-void exit_cb ( puObject * )
+static void exit_cb ( puObject * )
 {
   fprintf ( stderr, "Exiting PUI demo program.\n" ) ;
   exit ( 1 ) ;
@@ -336,10 +336,10 @@
 
   // Set up the font
 
-  tim = new fntTexFont ;
-  tim -> load ( "../fnt/data/old/times_medium.txf" ) ;
-  puFont times_medium ( tim, 15, 0.3f ) ;
-  puSetDefaultFonts        ( times_medium, times_medium ) ;
+  //tim = new fntTexFont ;
+  //tim -> load ( "../fnt/data/old/times_medium.txf" ) ;
+  //puFont times_medium ( tim, 15, 0.3f ) ;
+  //puSetDefaultFonts        ( times_medium, times_medium ) ;
   puSetDefaultStyle        ( PUSTYLE_SMALL_SHADED ) ;
   puSetDefaultColourScheme ( 0.1f, 0.8f, 0.1f, 1.0f) ;
 

Index: complex.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/pui/complex.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- complex.cxx	15 Aug 2002 00:35:36 -0000	1.19
+++ complex.cxx	31 Aug 2002 14:55:16 -0000	1.20
@@ -20,31 +20,30 @@
 *                                   *
 \***********************************/
 
-int          main_window ;
-puMenuBar   *main_menu_bar ;
-puButton    *hide_menu_button ;
-puDialogBox *dialog_box ;
-puText      *dialog_box_message ;
-puOneShot   *dialog_box_ok_button ;
-puText      *timer_text ;
-puGroup *mygroup ;
[...233 lines suppressed...]
 
   //load the texture for the save window
-  hel -> load ( "../fnt/data/old/helvetica_medium.txf" ) ;
-  tim -> load ( "../fnt/data/old/times_medium.txf" ) ;
+  //hel -> load ( "../fnt/data/old/helvetica_medium.txf" ) ;
+  //tim -> load ( "../fnt/data/old/times_medium.txf" ) ;
 
   // Coordinate Selection Window
 
@@ -560,8 +559,8 @@
   glutReshapeFunc       ( coordreshapefn ) ;
 
   //load the texture for the 2nd window
-  hel -> load ( "../fnt/data/old/helvetica_medium.txf" ) ;
-  tim -> load ( "../fnt/data/old/times_medium.txf" ) ;
+  //hel -> load ( "../fnt/data/old/helvetica_medium.txf" ) ;
+  //tim -> load ( "../fnt/data/old/times_medium.txf" ) ;
 
   puGroup *coordinate_group = new puGroup ( 0, 0 ) ;  // Necessary so that "groupdisplayfn" will draw all widgets
 

Index: widget_list.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/pui/widget_list.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- widget_list.cxx	30 Aug 2002 18:52:09 -0000	1.12
+++ widget_list.cxx	31 Aug 2002 14:55:16 -0000	1.13
@@ -22,70 +22,70 @@
 *                                   *
 \***********************************/
 
-int          main_window ;
+static int          main_window ;
 
-int button_box_window ;
-puButtonBox *button_box ;
+static int button_box_window ;
+static puButtonBox *button_box ;
 
[...304 lines suppressed...]
   large_input = new puLargeInput ( 10, 10, 240, 180, 2, 20 ) ;
   large_input->setLabel ( "Label" ) ;
@@ -611,7 +611,7 @@
   glutPassiveMotionFunc ( motionfn  ) ;
 #endif
 
-  tim -> load ( "../fnt/data/old/times_bold.txf" ) ;
+  //tim -> load ( "../fnt/data/old/times_bold.txf" ) ;
 
   char *combo_box_entries [] = { "First Entry", "Second Entry", "Third Entry", "Fourth Entry", "Sixth Entry", "Seventh Entry", NULL } ;
   combo_box = new puComboBox ( 10, 158, 250, 190,
@@ -633,7 +633,7 @@
   glutPassiveMotionFunc ( motionfn  ) ;
 #endif
 
-  tim -> load ( "../fnt/data/old/times_bold.txf" ) ;
+  //tim -> load ( "../fnt/data/old/times_bold.txf" ) ;
 
   glEnable ( GL_BLEND ) ;
   glAlphaFunc ( GL_GEQUAL, 0.1f ) ;