diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-09-18 06:39:59 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-09-18 06:39:59 +0800 |
| commit | afe6f502c326350cc31d34646d5000a964321525 (patch) | |
| tree | 9d9469a0ce33428e24e602fdbf87bc496864bc57 /widgets/misc/e-selection-model.c | |
| parent | b79bf3d187cabd11df74d2e6e414e41ae637f307 (diff) | |
| download | gsoc2013-evolution-afe6f502c326350cc31d34646d5000a964321525.tar gsoc2013-evolution-afe6f502c326350cc31d34646d5000a964321525.tar.gz gsoc2013-evolution-afe6f502c326350cc31d34646d5000a964321525.tar.bz2 gsoc2013-evolution-afe6f502c326350cc31d34646d5000a964321525.tar.lz gsoc2013-evolution-afe6f502c326350cc31d34646d5000a964321525.tar.xz gsoc2013-evolution-afe6f502c326350cc31d34646d5000a964321525.tar.zst gsoc2013-evolution-afe6f502c326350cc31d34646d5000a964321525.zip | |
Use new GDK keysym names if available.
In GTK+ 2.21.8, the keysym names were renamed from GDK_* to GDK_KEY_*.
I've added backward-compatibility macors to gtk-compat.h, which can be
dumped as soon as we require GTK+ >= 2.22.0.
Diffstat (limited to 'widgets/misc/e-selection-model.c')
| -rw-r--r-- | widgets/misc/e-selection-model.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c index f1b2c9bbf1..44a22d6eb3 100644 --- a/widgets/misc/e-selection-model.c +++ b/widgets/misc/e-selection-model.c @@ -29,6 +29,9 @@ #include "e-selection-model.h" +/* backward-compatibility cruft */ +#include "e-util/gtk-compat.h" + G_DEFINE_TYPE ( ESelectionModel, e_selection_model, @@ -704,14 +707,14 @@ e_selection_model_key_press (ESelectionModel *selection, selection->old_selection = -1; switch (key->keyval) { - case GDK_Up: - case GDK_KP_Up: + case GDK_KEY_Up: + case GDK_KEY_KP_Up: return move_selection (selection, TRUE, key->state); - case GDK_Down: - case GDK_KP_Down: + case GDK_KEY_Down: + case GDK_KEY_KP_Down: return move_selection (selection, FALSE, key->state); - case GDK_space: - case GDK_KP_Space: + case GDK_KEY_space: + case GDK_KEY_KP_Space: if (selection->mode != GTK_SELECTION_SINGLE) { gint row = e_selection_model_cursor_row (selection); gint col = e_selection_model_cursor_col (selection); @@ -725,8 +728,8 @@ e_selection_model_key_press (ESelectionModel *selection, return TRUE; } break; - case GDK_Return: - case GDK_KP_Enter: + case GDK_KEY_Return: + case GDK_KEY_KP_Enter: if (selection->mode != GTK_SELECTION_SINGLE) { gint row = e_selection_model_cursor_row (selection); gint col = e_selection_model_cursor_col (selection); @@ -737,8 +740,8 @@ e_selection_model_key_press (ESelectionModel *selection, return TRUE; } break; - case GDK_Home: - case GDK_KP_Home: + case GDK_KEY_Home: + case GDK_KEY_KP_Home: if (selection->cursor_mode == E_CURSOR_LINE) { gint row = 0; gint cursor_col = e_selection_model_cursor_col (selection); @@ -748,8 +751,8 @@ e_selection_model_key_press (ESelectionModel *selection, return TRUE; } break; - case GDK_End: - case GDK_KP_End: + case GDK_KEY_End: + case GDK_KEY_KP_End: if (selection->cursor_mode == E_CURSOR_LINE) { gint row = e_selection_model_row_count (selection) - 1; gint cursor_col = e_selection_model_cursor_col (selection); |