diff options
| -rw-r--r-- | perl-install/install/gtk.pm | 2 | ||||
| -rw-r--r-- | perl-install/interactive/gtk.pm | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm index ac5c49ba4..a1fa46ebf 100644 --- a/perl-install/install/gtk.pm +++ b/perl-install/install/gtk.pm @@ -228,7 +228,7 @@ sub handle_unsafe_mouse { sub special_shortcuts { my (undef, $event) = @_; - my $d = ${{ $Gtk2::Gdk::Keysyms{F2} => 'screenshot', $Gtk2::Gdk::Keysyms{Home} => 'restart' }}{$event->keyval}; + my $d = ${{ Gtk3::Gdk::KEY_F2 => 'screenshot', Gtk3::Gdk::KEY_Home => 'restart' }}{$event->keyval}; if ($d eq 'screenshot') { install::any::take_screenshot($::o); } elsif ($d eq 'restart' && member('control-mask', @{$event->state}) && member('mod1-mask', @{$event->state})) { diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index 61c886da2..d3b36abc3 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -10,7 +10,6 @@ use interactive; use common; use mygtk3; use ugtk3 qw(:helpers :wrappers :create); -use Gtk2::Gdk::Keysyms; my $forgetTime = 1000; #- in milli-seconds @@ -104,8 +103,8 @@ sub create_treeview_list { Glib::Source->remove($timeout) if $timeout; $timeout = ''; if ($event->keyval >= 0x100) { - $e->{may_go_to_next}(), return 1 if member($event->keyval, ($Gtk2::Gdk::Keysyms{Return}, $Gtk2::Gdk::Keysyms{KP_Enter})); - $starting_word = '' if !member($event->keyval, ($Gtk2::Gdk::Keysyms{Control_L}, $Gtk2::Gdk::Keysyms{Control_R})); + $e->{may_go_to_next}(), return 1 if member($event->keyval, (Gtk3::Gdk::KEY_Return, Gtk3::Gdk::KEY_KP_Enter)); + $starting_word = '' if !member($event->keyval, (Gtk3::Gdk::KEY_Control_L, Gtk3::Gdk::KEY_Control_R)); } else { if (member('control-mask', @{$event->state})) { $c eq 's' or return 1; @@ -268,8 +267,8 @@ sub create_treeview_tree { Glib::Source->remove($timeout) if $timeout; $timeout = ''; if ($event->keyval >= 0x100) { - &$toggle and return 1 if member($event->keyval, ($Gtk2::Gdk::Keysyms{Return}, $Gtk2::Gdk::Keysyms{KP_Enter})); - $starting_word = '' if !member($event->keyval, ($Gtk2::Gdk::Keysyms{Control_L}, $Gtk2::Gdk::Keysyms{Control_R})); + &$toggle and return 1 if member($event->keyval, (Gtk3::Gdk::KEY_Return, Gtk3::Gdk::KEY_KP_Enter)); + $starting_word = '' if !member($event->keyval, (Gtk3::Gdk::KEY_Control_L, Gtk3::Gdk::KEY_Control_R)); } else { my $next; if (member('control-mask', @{$event->state})) { |