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

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


Author: dburrows
Date: Mon Jun 27 21:25:19 2005
New Revision: 3481

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vs_button.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vs_button.h
Log:
Convert vs_button::handle_char to vs_button::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:25:19 2005
@@ -1,5 +1,9 @@
 2005-06-27  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/vs_button.cc, src/vscreen/vs_button.h:
+
+	  Convert vs_button::handle_char to vs_button::handle_key.
+
 	* src/vscreen/vscreen_widget.cc:
 
 	  Name change update: handle_char -> handle_key.

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	Mon Jun 27 21:25:19 2005
@@ -119,15 +119,16 @@
     pressed();
 }
 
-bool vs_button::handle_char(wint_t ch)
+bool vs_button::handle_key(const key &k)
 {
-  if(global_bindings.key_matches(ch, "PushButton") || global_bindings.key_matches(ch, "Confirm"))
+  if(global_bindings.key_matches(k, "PushButton") ||
+     global_bindings.key_matches(k, "Confirm"))
     {
       pressed();
       return true;
     }
   else
-    return vscreen_widget::handle_char(ch);
+    return vscreen_widget::handle_key(k);
 }
 
 int vs_button::width_request()

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_button.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_button.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_button.h	Mon Jun 27 21:25:19 2005
@@ -24,7 +24,7 @@
   void lose_focus();
 
 protected:
-  bool handle_char(wint_t ch);
+  bool handle_key(const key &k);
   fragment_cache *get_label() const {return label;}
 public:
   /** Instantiate a vs_button.