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

[Daniel Burrows]

Author: dburrows
Date: Tue Aug  9 00:35:12 2005
New Revision: 3771

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/view_changelog.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.h
Log:
Put back the default value of 'encoding' in vs_file_pager.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Aug  9 00:35:12 2005
@@ -2,6 +2,11 @@
 
 	* src/vscreen/vs_pager.h:
 
+	  Restore the default value for the "encoding" argument of the
+	  vs_file_pager constructors.
+
+	* src/vscreen/vs_pager.h:
+
 	  Make the vs_file_pager constructors protected, not private.
 
 	* src/download_list.cc:

Modified: branches/aptitude-0.3/aptitude/src/view_changelog.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/view_changelog.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/view_changelog.cc	Tue Aug  9 00:35:12 2005
@@ -56,8 +56,9 @@
   {
     search_for(L"");
   }
-public:
-  pkg_changelog_screen(pkg_changelog *_cl, vscreen_widget *owner=NULL, int x=0, int y=0, int width=0, int height=0):
+
+protected:
+  pkg_changelog_screen(pkg_changelog *_cl, int x=0, int y=0, int width=0, int height=0):
     vs_file_pager(_cl->get_filename()),cl(_cl)
   {
     connect_key("Search", &global_bindings,
@@ -66,6 +67,11 @@
 		sigc::mem_fun(*this, &pkg_changelog_screen::do_repeat_search));
   }
 
+public:
+  static ref_ptr<pkg_changelog_screen>
+  create(pkg_changelog *_cl,
+	 int x=0, int y=0, int width=0, int height=0):
+
   virtual ~pkg_changelog_screen() {delete cl;}
 };
 
@@ -103,12 +109,12 @@
       snprintf(buf, 512, _("%s changes"), ver.ParentPkg().Name());
       string tablabel(buf);
 
-      pkg_changelog_screen *cs=new pkg_changelog_screen(cl);
-      vs_table *t=new vs_table;
-      vs_scrollbar *s=new vs_scrollbar(vs_scrollbar::VERTICAL);
+      pkg_changelog_screen_ref cs=pkg_changelog_screen::create(cl);
+      vs_table_ref t=vs_table::create();
+      vs_scrollbar_ref s=vs_scrollbar::create(vs_scrollbar::VERTICAL);
 
-      cs->line_changed.connect(sigc::mem_fun(*s, &vs_scrollbar::set_slider));
-      s->scrollbar_interaction.connect(sigc::mem_fun(*cs, &pkg_changelog_screen::scroll_page));
+      cs->line_changed.connect(sigc::mem_fun(s.unsafe_get_ref(), &vs_scrollbar::set_slider));
+      s->scrollbar_interaction.connect(sigc::mem_fun(cs.unsafe_get_ref(), &pkg_changelog_screen::scroll_page));
       cs->scroll_top();
 
       t->add_widget_opts(cs, 0, 0, 1, 1, vs_table::EXPAND|vs_table::SHRINK, vs_table::EXPAND);

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_pager.h	Tue Aug  9 00:35:12 2005
@@ -180,10 +180,10 @@
 {
 protected:
   vs_file_pager();
-  vs_file_pager(const std::string &filename, const char *encoding);
-  vs_file_pager(const std::wstring &filename, const char *encoding);
+  vs_file_pager(const std::string &filename, const char *encoding = NULL);
+  vs_file_pager(const std::wstring &filename, const char *encoding = NULL);
 
-  vs_file_pager(const char *text, int len, const char *encoding);
+  vs_file_pager(const char *text, int len, const char *encoding = NULL);
 public:
   static ref_ptr<vs_file_pager> create()
   {