I apparently missed out a piece of code when doing the new GTK2 list

box: shortcut activations for list boxes are missing.

That's the last thing on the to-do list. We're now ready to merge
back to the trunk, given only some final testing!

[originally from svn r7967]

diff --git a/unix/GTK2.TODO b/unix/GTK2.TODO
deleted file mode 100644 (file)
index 3ab394c..0000000
--- a/unix/GTK2.TODO
+++ /dev/null
@@ -1,11 +0,0 @@
-TODO for PuTTY GTK2 port before merging back into main trunk code
------------------------------------------------------------------
-
-Things left to do:
-
- - I apparently missed out a piece of code when doing the new GTK2
-   list box: shortcut activations for list boxes are missing.
-
- - Merge to trunk. Colin is already mentioned in the licence in all
-   the branched copies, but mention him in the _website's_ licence
-   page too.

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 08bdf239039f4eb0aabe9a62798c764118fe5e45..9f7df3b42be4acee92e151a4f39ad6ba74e0fa1b 100644 (file)
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -2604,10 +2604,12 @@ int win_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data)
 
 #else
 
-               /*
-                * FIXME: apparently I forgot to put this back in
-                * for GTK 2. Oops.
-                */
+               if (sc->uc->treeview) {
+                   gtk_widget_grab_focus(sc->uc->treeview);
+               } else if (sc->uc->combo) {
+                   gtk_widget_grab_focus(sc->uc->combo);
+                   gtk_combo_box_popup(GTK_COMBO_BOX(sc->uc->combo));
+               }
 
 #endif