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

[Daniel Burrows]

Author: dburrows
Date: Fri May 27 02:44:12 2005
New Revision: 3292

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vscreen_widget.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vscreen_widget.h
Log:
Compilation fixes.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri May 27 02:44:12 2005
@@ -1,5 +1,9 @@
 2005-05-26  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/vscreen_widget.cc, src/vscreen/vscreen_widget.h:
+
+	Fix some compilation problems with the new stuff.
+
 	* src/vscreen/vscreen_widget.h:
 
 	Add in a per-widget stack of styles to be used when drawing the

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vscreen_widget.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vscreen_widget.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vscreen_widget.cc	Fri May 27 02:44:12 2005
@@ -30,7 +30,6 @@
    owner(NULL),
    geom(0,0,0,0),
    visible(false),
-   bgattr(get_color("DefaultWidgetBackground")),
    isfocussed(false)
 {
   focussed.connect(sigc::bind(sigc::mem_fun(*this, &vscreen_widget::set_isfocussed), true));
@@ -48,12 +47,12 @@
 
   bg_style=new_style;
   if(win)
-    win.setattr(bg_style.get_attr());
+    win.setattr(bg_style.get_attrs());
 }
 
 void vscreen_widget::push_style(const style &new_style)
 {
-  style_stack.push_back(get_style()+new_style);
+  style_stack.push_back(get_current_style()+new_style);
 
   win->setattr(style_stack.back().get_attrs());
 }

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vscreen_widget.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vscreen_widget.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vscreen_widget.h	Fri May 27 02:44:12 2005
@@ -321,7 +321,7 @@
   /** \return a reference to this widget's current style, valid until
    *  the widget is destroyed or a style is pushed/popped.
    */
-  const style &get_style()
+  const style &get_current_style() const
   {
     if(style_stack.empty())
       return bg_style;