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

[Daniel Burrows]

Author: dburrows
Date: Sat Jun 25 21:31:56 2005
New Revision: 3440

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/curses++.h
   branches/aptitude-0.3/aptitude/src/vscreen/vscreen_widget.h
Log:
Expose the addwstr family of functions.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Jun 25 21:31:56 2005
@@ -1,5 +1,9 @@
 2005-06-25  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/curses++.h, src/vscreen/vscreen_widget.h:
+
+	  Expose the addwstr family of functions.
+
 	* src/broken_indicator.cc:
 
 	  Fix two calls to join_fragments().

Modified: branches/aptitude-0.3/aptitude/src/vscreen/curses++.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/curses++.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/curses++.h	Sat Jun 25 21:31:56 2005
@@ -443,6 +443,16 @@
   int addch(chtype ch) {return waddch(win, ch);}
   int mvaddch(int y, int x, chtype ch) {return mvwaddch(win, y, x, ch);}
 
+  int addstr(const std::wstring &str) {return addstr(str.c_str());}
+  int addnstr(const std::wstring &str, int n) {return addnstr(str.c_str(), n);}
+  int mvaddstr(int y, int x, const std::wstring &str) {return mvaddstr(y, x, str.c_str());}
+  int mvaddnstr(int y, int x, const std::wstring &str, int n) {return addstr(str.c_str());}
+
+  int addstr(const wchar_t *str) {return waddwstr(win, str);}
+  int addnstr(const wchar_t *str, int n) {return waddnwstr(win, str, n);}
+  int mvaddstr(int y, int x, const wchar_t *str) {return mvwaddwstr(win, y, x, str);}
+  int mvaddnstr(int y, int x, const wchar_t *str, int n) {return mvwaddnwstr(win, y, x, str, n);}
+
   int addstr(const char *str) {return waddstr(win, str);}
   int addnstr(const char *str, int n) {return waddnstr(win, str, n);}
   int mvaddstr(int y, int x, const char *str) {return mvwaddstr(win, y, x, str);}

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	Sat Jun 25 21:31:56 2005
@@ -265,6 +265,16 @@
   int mvaddstr(int y, int x, const char *str) {return win?win.mvaddstr(y, x, str):0;}
   int mvaddnstr(int y, int x, const char *str, int n) {return win?win.mvaddnstr(y, x, str, n):0;}
 
+  int addstr(const wchar_t *str) {return win?win.addstr(str):0;}
+  int addnstr(const wchar_t *str, int n) {return win?win.addnstr(str, n):0;}
+  int mvaddstr(int y, int x, const wchar_t *str) {return win?win.mvaddstr(y, x, str):0;}
+  int mvaddnstr(int y, int x, const wchar_t *str, int n) {return win?win.mvaddnstr(y, x, str, n):0;}
+
+  int addstr(const std::wstring &str) {return win?win.addstr(str):0;}
+  int addnstr(const std::wstring &str, int n) {return win?win.addnstr(str, n):0;}
+  int mvaddstr(int y, int x, const std::wstring &str) {return win?win.mvaddstr(y, x, str):0;}
+  int mvaddnstr(int y, int x, const std::wstring &str, int n) {return win?win.mvaddnstr(y, x, str, n):0;}
+
   int addstr(const wchstring &str) {return win?win.addstr(str):0;}
   int addnstr(const wchstring &str, int n) {return win?win.addnstr(str, n):0;}
   int mvaddstr(int y, int x, const wchstring &str) {return win?win.mvaddstr(y, x, str):0;}