[Aptitude-devel] r3123 - in branches/aptitude-0.3/aptitude: . src/vscreen

[Daniel Burrows]

Author: dburrows
Date: Wed Apr 27 02:42:30 2005
New Revision: 3123

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/testvscreen.cc
Log:
Bring the test program into sync with the new EXPAND/FILL semantics.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Apr 27 02:42:30 2005
@@ -1,5 +1,9 @@
 2005-04-26  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/testvscreen.cc:
+
+	  Fix the test program's use of EXPAND/FILL.
+
 	* src/vscreen/vs_table.cc:
 
 	  Change the semantics of FILL/EXPAND: EXPAND only changes whether

Modified: branches/aptitude-0.3/aptitude/src/vscreen/testvscreen.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/testvscreen.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/testvscreen.cc	Wed Apr 27 02:42:30 2005
@@ -286,9 +286,9 @@
   vs_file_pager *pager=new vs_file_pager(s, strlen(s));
   vs_scrollbar *scrl=new vs_scrollbar(vs_scrollbar::VERTICAL, 0, 0);
 
-  tbl->add_widget_opts(ln, 0, 0, 1, 2, vs_table::EXPAND | vs_table::SHRINK, vs_table::SHRINK);
-  tbl->add_widget_opts(pager, 1, 0, 1, 1, vs_table::SHRINK, vs_table::EXPAND);
-  tbl->add_widget_opts(scrl, 1, 1, 1, 1, vs_table::ALIGN_LEFT, vs_table::EXPAND);
+  tbl->add_widget_opts(ln, 0, 0, 1, 2, vs_table::EXPAND | vs_table::FILL | vs_table::SHRINK, vs_table::SHRINK);
+  tbl->add_widget_opts(pager, 1, 0, 1, 1, vs_table::SHRINK, vs_table::EXPAND | vs_table::FILL);
+  tbl->add_widget_opts(scrl, 1, 1, 1, 1, vs_table::ALIGN_LEFT, vs_table::EXPAND | vs_table::FILL);
 
   ln->entered.connect(sigc::bind(sigc::ptr_fun(&do_load_file), ln));
   ln->entered.connect(sigc::mem_fun(*pager, &vs_file_pager::load_file));
@@ -418,7 +418,7 @@
   vscreen_widget *w=new vs_frame(new vs_center(new vs_label("Pane 1")));
   table->add_widget(w, 0, 0, 2, 1, false);
   w=new vs_frame(new vs_center(new vs_label("Pane 2")));
-  table->add_widget_opts(w, 0, 1, 1, 1, vs_table::EXPAND, 0);
+  table->add_widget_opts(w, 0, 1, 1, 1, vs_table::EXPAND | vs_table::FILL, 0);
 
   vs_editline::history_list h;
   vs_editline *l=new vs_editline(20, "Input: ", "Pane 3", &h);