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

[Daniel Burrows]

Author: dburrows
Date: Tue Jun  7 15:32:58 2005
New Revision: 3366

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/edit_pkg_hier.cc
   branches/aptitude-0.3/aptitude/src/edit_pkg_hier.h
Log:
Update the hierarchy editor for the new display protocols.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Jun  7 15:32:58 2005
@@ -1,5 +1,10 @@
 2005-06-07  Daniel Burrows  <dburrows@debian.org>
 
+	* src/edit_pkg_hier.cc, src/edit_pkg_hier.h:
+
+	Update for the new display protocols; add missing copyright
+	boilerplate.
+
 	* src/download_screen.cc:
 
 	Use get_style instead of get_color.

Modified: branches/aptitude-0.3/aptitude/src/edit_pkg_hier.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/edit_pkg_hier.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/edit_pkg_hier.cc	Tue Jun  7 15:32:58 2005
@@ -1,4 +1,22 @@
 // edit_pkg_hier.cc
+//
+//   Copyright (C) 2000-2001, 2004-2005 Daniel Burrows
+//
+//   This program is free software; you can redistribute it and/or
+//   modify it under the terms of the GNU General Public License as
+//   published by the Free Software Foundation; either version 2 of
+//   the License, or (at your option) any later version.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//   General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program; see the file COPYING.  If not, write to
+//   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+//   Boston, MA 02111-1307, USA.
+
 
 #include "edit_pkg_hier.h"
 
@@ -57,7 +75,7 @@
       vs_treeitem::dispatch_mouse(id, x, bstate, owner);
   }
 
-  void paint(vs_tree *win, int y, bool hierarchical)
+  void paint(vs_tree *win, int y, bool hierarchical, const style &st)
   {
     string::size_type width=win->get_width();
     string todisp=" ";
@@ -119,7 +137,7 @@
   silly_subtree(bool expanded, string _txt)
     :vs_subtree_generic(expanded), txt(_txt) {}
 
-  void paint(vs_tree *win, int y, bool hierarchical)
+  void paint(vs_tree *win, int y, bool hierarchical, const style &st)
   {
     vs_subtree_generic::paint(win, y, hierarchical, txt);
   }
@@ -152,12 +170,12 @@
     return true;
 }
 
-void vs_hier_editor::paint()
+void vs_hier_editor::paint(const style &st)
 {
   if(!item)
     mvaddnstr(0, 0, _("No hierarchy information to edit"), get_width());
   else
-    vs_tree::paint();
+    vs_tree::paint(st);
 }
 
 // Creates a new list of edit-widgets if pkg isn't an end iterator.

Modified: branches/aptitude-0.3/aptitude/src/edit_pkg_hier.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/edit_pkg_hier.h	(original)
+++ branches/aptitude-0.3/aptitude/src/edit_pkg_hier.h	Tue Jun  7 15:32:58 2005
@@ -1,6 +1,22 @@
 // edit_pkg_hier.h           -*-c++-*-
 //
-//  Copyright 2001 Daniel Burrows
+//  Copyright 2001, 2005 Daniel Burrows
+//
+//
+//   This program is free software; you can redistribute it and/or
+//   modify it under the terms of the GNU General Public License as
+//   published by the Free Software Foundation; either version 2 of
+//   the License, or (at your option) any later version.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//   General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program; see the file COPYING.  If not, write to
+//   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+//   Boston, MA 02111-1307, USA.
 //
 // This provides a convenient way to tweak the package hierarchy.  It lets
 // the user select which 'groups' a package appears in, then allows them to
@@ -39,7 +55,7 @@
 protected:
   virtual bool handle_char(chtype ch);
 
-  void paint();
+  void paint(const style &st);
 public:
   bool get_cursorvisible();