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

[Daniel Burrows]

Author: dburrows
Date: Wed Jun 29 18:56:34 2005
New Revision: 3513

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/TODO
   branches/aptitude-0.3/aptitude/src/vscreen/vs_button.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vs_scrollbar.cc
Log:
ACS -> WACS

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Jun 29 18:56:34 2005
@@ -1,5 +1,9 @@
 2005-06-29  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/vs_button.cc, src/vscreen/vs_scrollbar.cc:
+
+	  Convert all uses of ACS_* to WACS_*.
+
 	* src/vscreen/vs_statuschoice.cc, src/vscreen/vs_statuschoice.h:
 
 	  Convert vs_statuschoice to handle wide characters.

Modified: branches/aptitude-0.3/aptitude/TODO
==============================================================================
--- branches/aptitude-0.3/aptitude/TODO	(original)
+++ branches/aptitude-0.3/aptitude/TODO	Wed Jun 29 18:56:34 2005
@@ -10,7 +10,7 @@
 
    - left to do in UTF8:
 
-    * ACS -> WACS
+    * ACS -> WACS  (done in src/vscreen/)
     * all of src/
 
    - Display layout loose ends:

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_button.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_button.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_button.cc	Wed Jun 29 18:56:34 2005
@@ -79,15 +79,15 @@
       move(i, 0);
 
       if(lines.size() == 1)
-	addch('[');
+	add_wch(L'[');
       else if(i==0)
-	addch(ACS_ULCORNER);
+	add_wch(WACS_ULCORNER);
       else if(i+1==lines.size())
-	addch(ACS_LLCORNER);
+	add_wch(WACS_LLCORNER);
       else
-	addch(ACS_VLINE);
+	add_wch(WACS_VLINE);
 
-      addch(' ');
+      add_wch(L' ');
 
       const fragment_line &l=lines[i];
       addstr(l);
@@ -96,17 +96,17 @@
       while(w+1<getmaxx())
 	{
 	  ++w;
-	  addch(' ');
+	  add_wch(L' ');
 	}
 
       if(lines.size() == 1)
-	addch(']');
+	add_wch(L']');
       else if(i==0)
-	addch(ACS_URCORNER);
+	add_wch(WACS_URCORNER);
       else if(i+1==lines.size())
-	addch(ACS_LRCORNER);
+	add_wch(WACS_LRCORNER);
       else
-	addch(ACS_VLINE);
+	add_wch(WACS_VLINE);
     }
 }
 

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_scrollbar.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_scrollbar.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_scrollbar.cc	Wed Jun 29 18:56:34 2005
@@ -19,9 +19,9 @@
 
       for(int x=0; x<width; x++)
 	if(x==thumbloc)
-	  mvaddch(0, x, '#');
+	  mvadd_wch(0, x, L'#');
 	else
-	  mvaddch(0, x, ACS_CKBOARD);
+	  mvadd_wch(0, x, WACS_CKBOARD);
     }
   else
     {
@@ -30,9 +30,9 @@
 
       for(int y=0; y<height; y++)
 	if(y==thumbloc)
-	  mvaddch(y, 0, '#');
+	  mvadd_wch(y, 0, L'#');
 	else
-	  mvaddch(y, 0, ACS_CKBOARD);
+	  mvadd_wch(y, 0, WACS_CKBOARD);
     }
 }