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

[Daniel Burrows]

Author: dburrows
Date: Mon Jun 27 21:37:34 2005
New Revision: 3484

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vs_menubar.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vs_menubar.h
Log:
Convert vs_menubar::dispatch_key to vs_menubar::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:37:34 2005
@@ -1,5 +1,9 @@
 2005-06-27  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/vs_menubar.cc, src/vscreen/vs_menubar.h:
+
+	  Convert vs_menubar::dispatch_key to vs_menubar::handle_key.
+
 	* src/vscreen/vs_menu.cc, src/vscreen/vs_menu.h:
 
 	  Convert vs_menu::handle_char to vs_editline::handle_key.

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_menubar.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_menubar.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_menubar.cc	Mon Jun 27 21:37:34 2005
@@ -317,9 +317,9 @@
     }
 }
 
-bool vs_menubar::handle_char(chtype ch)
+bool vs_menubar::handle_key(const key &k)
 {
-  if(bindings->key_matches(ch, "ToggleMenuActive"))
+  if(bindings->key_matches(k, "ToggleMenuActive"))
     {
       if(active)
 	disappear();
@@ -328,7 +328,7 @@
     }
   else if(active)
     {
-      if(bindings->key_matches(ch, "Cancel"))
+      if(bindings->key_matches(k, "Cancel"))
 	{
 	  disappear();
 
@@ -341,7 +341,7 @@
 	}
       else if(!active_menus.empty())
 	{
-	  if(bindings->key_matches(ch, "Right"))
+	  if(bindings->key_matches(k, "Right"))
 	    {
 	      if(items.size()>0)
 		{
@@ -360,7 +360,7 @@
 		  vscreen_update();
 		}
 	    }
-	  else if(bindings->key_matches(ch, "Left"))
+	  else if(bindings->key_matches(k, "Left"))
 	    {
 	      if(items.size()>0)
 		{
@@ -378,12 +378,12 @@
 		  vscreen_update();
 		}
 	    }
-	  else if(active_menus.front()->dispatch_char(ch))
+	  else if(active_menus.front()->dispatch_key(k))
 	    return true;
 	  else
-	    return vscreen_widget::handle_char(ch);
+	    return vscreen_widget::handle_key(k);
 	}
-      else if(bindings->key_matches(ch, "Right"))
+      else if(bindings->key_matches(k, "Right"))
 	{
 	  if(items.size()>0)
 	    {
@@ -395,7 +395,7 @@
 	      vscreen_update();
 	    }
 	}
-      else if(bindings->key_matches(ch, "Left"))
+      else if(bindings->key_matches(k, "Left"))
 	{
 	  if(items.size()>0)
 	    {
@@ -407,20 +407,21 @@
 	      vscreen_update();
 	    }
 	}
-      else if(bindings->key_matches(ch, "Down") || bindings->key_matches(ch, "Confirm"))
+      else if(bindings->key_matches(k, "Down") ||
+	      bindings->key_matches(k, "Confirm"))
 	{
 	  if(items.size()>0)
 	    items[curloc].menu->show();
 	}
       else
-	return vscreen_widget::handle_char(ch);
+	return vscreen_widget::handle_key(k);
 
       return true;
     }
-  else if(subwidget && subwidget->dispatch_char(ch))
+  else if(subwidget && subwidget->dispatch_key(k))
     return true;
   else
-    return vscreen_widget::handle_char(ch);
+    return vscreen_widget::handle_key(k);
 
   return true;
 }

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_menubar.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_menubar.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_menubar.h	Mon Jun 27 21:37:34 2005
@@ -63,7 +63,7 @@
   void got_focus();
   void lost_focus();
 protected:
-  virtual bool handle_char(chtype ch);
+  virtual bool handle_key(const key &k);
 public:
   vs_menubar(bool _always_visible=true);
   ~vs_menubar();