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

[Daniel Burrows]

Author: dburrows
Date: Sat Sep 24 01:06:48 2005
New Revision: 4209

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/solution_screen.cc
Log:
Get the resolver menu working properly.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Sep 24 01:06:48 2005
@@ -1,5 +1,11 @@
 2005-09-23  Daniel Burrows  <dburrows at debian.org>
 
+	* src/solution_screen.cc:
+
+	  Switch back to using the widget itself as the menu target, and
+	  bind menu handlers for the info area; the resolver menu works
+	  now!
+
 	* src/menu_redirect.cc:
 
 	  Merge do_menu_test and do_menu_action into do_menu_callback, and

Modified: branches/aptitude-0.3/aptitude/src/solution_screen.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_screen.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/solution_screen.cc	Sat Sep 24 01:06:48 2005
@@ -402,10 +402,10 @@
     return true;
   }
 public:
-  void connect_menu_signals(const vs_widget_ref &valve)
+  void connect_menu_signals()
   {
-    create_menu_bindings(story_tree.unsafe_get_ref(), valve);
-    create_menu_bindings(solution_tree.unsafe_get_ref(), valve);
+    create_menu_bindings(story_tree.unsafe_get_ref(), story_tree);
+    create_menu_bindings(solution_tree.unsafe_get_ref(), solution_tree);
   }
 
   static ref_ptr<solution_examiner> create(const sigc::slot1<void, fragment *> &set_short_description,
@@ -517,7 +517,7 @@
   vs_table_ref rval     = vs_table::create();
 
   vs_label_ref l        = vs_label::create(L"");
-  vs_tree_ref info_tree = vs_tree::create();
+  menu_tree_ref info_tree = menu_tree::create();
 
   solution_examiner_ref examiner
     = solution_examiner::create(sigc::mem_fun(l.unsafe_get_ref(),
@@ -526,7 +526,8 @@
 					   info_tree.unsafe_get_ref()));
 
 
-  examiner->connect_menu_signals(rval);
+  examiner->connect_menu_signals();
+  create_menu_bindings(info_tree.unsafe_get_ref(), info_tree);
 
 
   info_tree->connect_key("ShowHideDescription", &global_bindings,