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

[Daniel Burrows]

Author: dburrows
Date: Sun Jun 26 16:48:05 2005
New Revision: 3456

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/curses++.h
Log:
Fix compilation problems

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Jun 26 16:48:05 2005
@@ -2,6 +2,11 @@
 
 	* src/vscreen/curses++.h:
 
+	  Doh, make it compile (forgot to #undef the macros and dropped
+	  some paramters from mvget_wch).
+
+	* src/vscreen/curses++.h:
+
 	  Expose wget_wch and mvwget_wch as methods on cwindow.
 
 	* src/vscreen/vs_button.cc, src/vscreen/vs_button.h:

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	Sun Jun 26 16:48:05 2005
@@ -305,6 +305,7 @@
 #undef echochar
 #undef erase
 #undef getch
+#undef get_wch
 #undef getstr
 #undef inch
 #undef inchnstr
@@ -331,6 +332,7 @@
 #undef mvaddstr
 #undef mvdelch
 #undef mvgetch
+#undef mvget_wch
 #undef mvgetnstr
 #undef mvgetstr
 #undef mvhline
@@ -501,7 +503,7 @@
   int mvgetch(int y, int x) {return mvwgetch(win, y, x);}
 
   int get_wch(wint_t *wch) {return wget_wch(win, wch);}
-  int mvget_wch(wint_t *wch) {return mvwget_wch(win, wch);}
+  int mvget_wch(int y, int x, wint_t *wch) {return mvwget_wch(win, y, x, wch);}
 
   int move(int y, int x) {return wmove(win, y, x);}
   void getyx(int &y, int &x) {_getyx(win, y, x);}