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

[Daniel Burrows]

Author: dburrows
Date: Tue Jun  7 17:34:10 2005
New Revision: 3371

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/pkg_view.cc
Log:
Finish updating pkg_view for styles.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Jun  7 17:34:10 2005
@@ -1,5 +1,11 @@
 2005-06-07  Daniel Burrows  <dburrows@debian.org>
 
+	* src/pkg_view.cc:
+
+	Adjust the remaining bits of pkg_view to handle styles properly:
+	change paint()'s signature, and use set_bg_style instead of
+	set_bg.
+
 	* src/pkg_item.cc, src/pkg_item.h:
 
 	Extend the signature of pkg_item::paint() to properly override its

Modified: branches/aptitude-0.3/aptitude/src/pkg_view.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_view.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/pkg_view.cc	Tue Jun  7 17:34:10 2005
@@ -1,6 +1,21 @@
 // pkg_view.cc
 //
-//  Copyright 2000-2002 Daniel Burrows
+//  Copyright 2000-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 "pkg_view.h"
 
@@ -81,7 +96,7 @@
     vscreen_update();
   }
 
-  void paint()
+  void paint(const style &st)
   {
     if(apt_cache_file)
       {
@@ -101,7 +116,7 @@
     else
       set_text("");
 
-    vs_label::paint();
+    vs_label::paint(st);
   }
 };
 
@@ -460,7 +475,7 @@
 	  rval->add_widget_opts(i->widget, i->row, i->col, i->h, i->w,
 				xopts, yopts);
 
-	  i->widget->set_bg(i->bg);
+	  i->widget->set_bg_style(i->st);
 
 	  if(i->popupdownkey.size()>0)
 	    rval->connect_key(i->popupdownkey,