From bfa9859f2a9cb5697299f33b9148960b59e4e3a4 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Fri, 4 Apr 2008 11:02:26 +0000 Subject: [PATCH] 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] --- unix/GTK2.TODO | 11 ----------- unix/gtkdlg.c | 10 ++++++---- 2 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 unix/GTK2.TODO diff --git a/unix/GTK2.TODO b/unix/GTK2.TODO deleted file mode 100644 index 3ab394cf..00000000 --- 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 08bdf239..9f7df3b4 100644 --- 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