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

[Daniel Burrows]

Author: dburrows
Date: Sun Jun 26 17:32:32 2005
New Revision: 3467

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vs_label.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vs_label.h
Log:
Allow labels to be initialized directly from wstrings.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Jun 26 17:32:32 2005
@@ -1,5 +1,9 @@
 2005-06-26  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/vs_label.cc, src/vscreen/vs_label.h:
+
+	  Add initializers for wstrings.
+
 	* src/vscreen/transcode.h:
 
 	  Add a kinder, gentler transcoding interface for when error

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_label.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_label.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_label.cc	Sun Jun 26 17:32:32 2005
@@ -27,6 +27,17 @@
 {
 }
 
+vs_label::vs_label(const wstring &_txt, const style &st)
+  :txt(new fragment_cache(text_fragment(_txt)))
+{
+  set_bg_style(st);
+}
+
+vs_label::vs_label(const wstring &_txt)
+  :txt(new fragment_cache(text_fragment(_txt)))
+{
+}
+
 vs_label::~vs_label()
 {
   delete txt;

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_label.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_label.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_label.h	Sun Jun 26 17:32:32 2005
@@ -15,7 +15,10 @@
   vs_label(fragment *f);
   vs_label(const std::string &_txt, const style &st);
   vs_label(const std::string &_txt);
-  ~vs_label();
+
+  vs_label(const std::wstring &_txt, const style &st);
+  vs_label(const std::wstring &_txt); 
+ ~vs_label();
 
   bool get_cursorvisible();
   point get_cursorloc();