[Plib-cvs] plib/demos/p-guide/src StatusWindow.cxx,1.9,1.10 pGuide.cxx,1.11,1.12

[James J. <pu...@us...>]

Update of /cvsroot/plib/plib/demos/p-guide/src
In directory sc8-pr-cvs1:/tmp/cvs-serv15535

Modified Files:
	StatusWindow.cxx pGuide.cxx 
Log Message:
Improved layer support, re-done layout of StatusWindow.

Fixed indent in pGuide.cxx... oops!


Index: StatusWindow.cxx
===================================================================
RCS file: /cvsroot/plib/plib/demos/p-guide/src/StatusWindow.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- StatusWindow.cxx	1 Sep 2002 11:40:10 -0000	1.9
+++ StatusWindow.cxx	23 Jan 2003 22:07:53 -0000	1.10
@@ -50,6 +50,8 @@
 puInput *object_position_x ;
 puInput *object_position_y ;
 
+static puFrame *widget_section_frame ;
+
 static puInput *object_label ;
 static puComboBox *object_vert_label_place ;
 static puComboBox *object_horz_label_place ;
@@ -60,9 +62,20 @@
 static puInput *object_name ;
 static puButtonBox *object_callbacks ;
[...215 lines suppressed...]
   window_size_x->setCallback ( window_size_cb ) ;
   window_size_x->setDownCallback ( window_size_cb ) ;
@@ -1000,7 +1090,7 @@
   extern int main_window_x, main_window_y ;
 
   window_position_x = new puInput ( 130, 285, 180 , 305 ) ;
-  window_position_x->setLabel ( "Position :" ) ;
+  window_position_x->setLabel ( "Position:" ) ;
   window_position_x->setLabelPlace ( PUPLACE_CENTERED_LEFT ) ;
   window_position_x->setValuator ( &main_window_x ) ;
 
@@ -1011,7 +1101,7 @@
                main_window_color_b, main_window_color_a ;
 
   window_color_label = new puText (340, 320) ;
-  window_color_label->setLabel ( "Color: " ) ;
+  window_color_label->setLabel ( "Color:" ) ;
 
   window_color_r = new puSpinBox ( 270, 285, 320, 305 ) ;
   window_color_r->setMinValue(0.0);

Index: pGuide.cxx
===================================================================
RCS file: /cvsroot/plib/plib/demos/p-guide/src/pGuide.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- pGuide.cxx	23 Jan 2003 18:46:03 -0000	1.11
+++ pGuide.cxx	23 Jan 2003 22:07:53 -0000	1.12
@@ -81,8 +81,8 @@
 extern int properties_window;
 
 // Definitions
-  #define RESIZING_BORDER_WIDTH   5
-  #define RESIZING_CORNER_BORDER_WIDTH   4
+#define RESIZING_BORDER_WIDTH   5
+#define RESIZING_CORNER_BORDER_WIDTH   4
   /** 4 seems to be the best number for this define... this makes sure  *
    *  that the default widget size allows you to still resize along the *
    *  X axis without difficulty -  23 Jan 03 JCJ                       **/