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

Daniel Burrows dburrows@costa.debian.org
Mon, 27 Jun 2005 21:41:02 +0000


Author: dburrows
Date: Mon Jun 27 21:41:00 2005
New Revision: 3486

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vs_passthrough.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vs_passthrough.h
Log:
Convert vs_passthrough::handle_char to vs_passthrough::handle_key.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Jun 27 21:41:00 2005
@@ -1,5 +1,10 @@
 2005-06-27  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/vs_passthrough.cc, src/vscreen/vs_passthrough.h:
+
+	  Convert vs_passthrough::handle_char to
+	  vs_passthrough::handle_key.
+
 	* src/vscreen/vs_pager.cc, src/vscreen/vs_pager.h:
 
 	  Convert vs_pager::handle_char to vs_pager::handle_key.

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_passthrough.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_passthrough.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_passthrough.cc	Mon Jun 27 21:41:00 2005
@@ -69,14 +69,14 @@
     return point(0, 0);
 }
 
-bool vs_passthrough::handle_char(chtype ch)
+bool vs_passthrough::handle_key(const key &k)
 {
   vscreen_widget *w=get_focus();
 
   if(w && w->get_visible() && w->focus_me())
-    return w->dispatch_char(ch) || vs_container::handle_char(ch);
+    return w->dispatch_key(k) || vs_container::handle_key(k);
   else
-    return vs_container::handle_char(ch);
+    return vs_container::handle_key(k);
 }
 
 void vs_passthrough::dispatch_mouse(short id, int x, int y, int z,

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_passthrough.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_passthrough.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_passthrough.h	Mon Jun 27 21:41:00 2005
@@ -14,7 +14,7 @@
   void lost_focus();
 
 protected:
-  virtual bool handle_char(chtype ch);
+  virtual bool handle_key(const key &k);
 
   // These call focussed() and unfocussed() on the result of get_focus().
   // (convenience methods)