diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2018-06-14 18:19:38 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2018-06-14 18:19:38 +0000 |
| commit | 19bad0b6b3690bbeb287c64e5a30d7aabe015f4f (patch) | |
| tree | 313c22f5dbb5c71bbc85a81f397debeaa790eb36 /src/widgets/ink-comboboxentry-action.cpp | |
| parent | Merge branch 'GermanTranslation' of gitlab.com:der-Michael/inkscape (diff) | |
| parent | Make shutdown dialogs use gtkmm. (diff) | |
| download | inkscape-19bad0b6b3690bbeb287c64e5a30d7aabe015f4f.tar.gz inkscape-19bad0b6b3690bbeb287c64e5a30d7aabe015f4f.zip | |
Merge branch 'gdkmm' of gitlab.com:linkmauve/inkscape
Diffstat (limited to 'src/widgets/ink-comboboxentry-action.cpp')
| -rw-r--r-- | src/widgets/ink-comboboxentry-action.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/ink-comboboxentry-action.cpp b/src/widgets/ink-comboboxentry-action.cpp index 2fecb06a4..133ae7878 100644 --- a/src/widgets/ink-comboboxentry-action.cpp +++ b/src/widgets/ink-comboboxentry-action.cpp @@ -29,6 +29,7 @@ #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> +#include <gdkmm/display.h> #include "widgets/ink-comboboxentry-action.h" #include "ui/icon-names.h" @@ -921,7 +922,7 @@ gboolean keypress_cb( GtkWidget * /*widget*/, GdkEventKey *event, gpointer data gboolean wasConsumed = FALSE; /* default to report event not consumed */ guint key = 0; Ink_ComboBoxEntry_Action* action = INK_COMBOBOXENTRY_ACTION( data ); - gdk_keymap_translate_keyboard_state( gdk_keymap_get_for_display( gdk_display_get_default() ), + gdk_keymap_translate_keyboard_state( Gdk::Display::get_default()->get_keymap(), event->hardware_keycode, (GdkModifierType)event->state, 0, &key, 0, 0, 0 ); |