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

[Daniel Burrows]

Author: dburrows
Date: Mon Jun 27 21:56:27 2005
New Revision: 3492

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vs_subtree.h
   branches/aptitude-0.3/aptitude/src/vscreen/vs_tree.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vs_treeitem.h
Log:
Convert various dispatch_char routines in the vs_treeitem classes to dispatch_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:56:27 2005
@@ -10,6 +10,12 @@
 
 2005-06-27  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/vs_subtree.h src/vscreen/vs_tree.cc src/vscreen/vs_treeitem.h:
+
+	  Convert various dispatch_char routines to dispatch_key. (DANGER:
+	  forgetting to do this will result in a silently broken widget at
+	  the moment)
+
 	* src/vscreen/vs_tree.cc, src/vscreen/vs_tree.h:
 
 	  Convert vs_tree::handle_char to vs_tree::handle_key.

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_subtree.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_subtree.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_subtree.h	Mon Jun 27 21:56:27 2005
@@ -160,23 +160,24 @@
     sort(sorter);
   }
 
-  virtual bool dispatch_char(chtype ch, vs_tree *owner)
+  virtual bool dispatch_key(const key &k, vs_tree *owner)
   {
-    if(vs_tree::bindings->key_matches(ch, "ToggleExpanded"))
+    if(vs_tree::bindings->key_matches(k, "ToggleExpanded"))
       {
 	expanded=!expanded;
 	return true;
       }
-    else if(vs_tree::bindings->key_matches(ch, "ExpandTree"))
+    else if(vs_tree::bindings->key_matches(k, "ExpandTree"))
       {
         if(!expanded)
-	{
-	  expanded=true;
-	  return true;
-	} else
+	  {
+	    expanded=true;
+	    return true;
+	  }
+	else
 	  return false;
       }
-    else if(vs_tree::bindings->key_matches(ch, "CollapseTree"))
+    else if(vs_tree::bindings->key_matches(k, "CollapseTree"))
       {
 	if(expanded)
 	{
@@ -185,12 +186,12 @@
 	} else
 	  return false;
       }
-    else if(vs_tree::bindings->key_matches(ch, "ExpandAll"))
+    else if(vs_tree::bindings->key_matches(k, "ExpandAll"))
       {
 	expand_all();
 	return true;
       }
-    else if(vs_tree::bindings->key_matches(ch, "CollapseAll"))
+    else if(vs_tree::bindings->key_matches(k, "CollapseAll"))
       {
 	collapse_all();
 	return true;

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_tree.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_tree.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_tree.cc	Mon Jun 27 21:56:27 2005
@@ -677,7 +677,7 @@
       else
 	{
 	  if(selected!=end && selected->get_selectable() &&
-	     selected->dispatch_char(k, this))
+	     selected->dispatch_key(k, this))
 	    vscreen_update();
 	  else
 	    return vscreen_widget::handle_key(k);

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_treeitem.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_treeitem.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_treeitem.h	Mon Jun 27 21:56:27 2005
@@ -156,7 +156,7 @@
   // Called when an item is highlighted
   virtual void unhighlighted(vs_tree *win) {}
   // Called when the highlight leaves an item.
-  virtual bool dispatch_char(chtype ch, vs_tree *owner) {return false;}
+  virtual bool dispatch_key(const key &k, vs_tree *owner) {return false;}
   // Called when a key is pressed while the item is highlighted.  The return
   // value indicates whether a redraw of the screen is needed.
   // (not any more; now it indicates whether the item consumed the keystroke
@@ -166,7 +166,6 @@
   }
   // Called when a mouse event occurs at the y location assigned to this
   // item.
-  virtual void dispatch_char(chtype ch) {}
 
   virtual vs_tree_levelref *begin() {return NULL;}
   virtual vs_tree_levelref *end() {return NULL;}