[Aptitude-svn-commit] r3473 - in branches/aptitude-0.3/aptitude: . src/vscreen

[Daniel Burrows]

Author: dburrows
Date: Sun Jun 26 18:18:36 2005
New Revision: 3473

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/testvscreen.cc
Log:
Update the vscreen test program so it compiles.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Jun 26 18:18:36 2005
@@ -1,5 +1,9 @@
 2005-06-26  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/testvscreen.cc:
+
+	  Update the test program for the new vscreen interfaces.
+
 	* src/vscreen/vs_pager.cc, src/vscreen/vs_pager.h:
 
 	  Use const string &'s in the vs_file_pager interface.

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	Sun Jun 26 18:18:36 2005
@@ -4,6 +4,7 @@
 // main Aptitude program.  This is it.
 
 #include "fragment.h"
+#include "transcode.h"
 #include "vscreen.h"
 #include "vscreen_widget.h"
 #include "vs_button.h"
@@ -277,9 +278,9 @@
   return rval;
 }
 
-static void do_load_file(string s, vs_editline *p)
+static void do_load_file(wstring s, vs_editline *p)
 {
-  p->set_text("");
+  p->set_text(L"");
 }
 
 vscreen_widget *pager_test()
@@ -295,7 +296,7 @@
   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));
+  ln->entered.connect(sigc::mem_fun(*pager, (void (vs_file_pager::*)(const std::wstring &)) &vs_file_pager::load_file));
   pager->line_changed.connect(sigc::mem_fun(*scrl, &vs_scrollbar::set_slider));
   pager->do_line_signal();
   scrl->scrollbar_interaction.connect(sigc::mem_fun(*pager, &vs_pager::scroll_page));
@@ -315,7 +316,7 @@
     label->hide();
 }
 
-void do_editline_history(std::string s, vs_editline *l)
+void do_editline_history(std::wstring s, vs_editline *l)
 {
   l->add_to_history(s);
   l->reset_history();
@@ -409,7 +410,7 @@
 
   switcher->add_visible_widget(new vs_center(new vs_size_box(size(20, 8), new vs_frame(new vs_center(new vs_label(flowbox(fragf("This is another screen.%nNotice that this label is properly word-wrapped."))))))), true);
   switcher->add_visible_widget(new vs_label("This is one screen."), true);
-  switcher->add_visible_widget(vs_dialog_ok("Press any key to hide this widget"), true);
+  switcher->add_visible_widget(vs_dialog_ok(transcode("Press any key to hide this widget")), true);
   switcher->add_visible_widget(make_test_treewidget(), true);
 
   vs_table *ttable=new vs_table;
@@ -444,7 +445,7 @@
 
   stacker->add_visible_widget(switcher, true);
 
-  stacker->add_visible_widget(vs_dialog_ok("Vscreen test program - press any key to begin"), true);
+  stacker->add_visible_widget(vs_dialog_ok(transcode("Vscreen test program - press any key to begin")), true);
 
   toplevel->set_main_widget(stacker);
   stacker->show();