From 29c4096266443743dcd8884d97739d7c31c4aaac Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Wed, 5 Sep 2012 10:44:51 +0000 Subject: [PATCH] Replace deprecated GDK_* with GDK_KEY_* git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22357 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/gnome-utils/gnc-date-edit.c | 7 ++- src/gnome-utils/gnc-main-window.c | 3 +- src/register/register-gnome/combocell-gnome.c | 9 +-- src/register/register-gnome/datecell-gnome.c | 3 +- .../register-gnome/formulacell-gnome.c | 7 ++- .../register-gnome/gnucash-date-picker.c | 15 ++--- .../register-gnome/gnucash-item-list.c | 11 ++-- src/register/register-gnome/gnucash-sheet.c | 55 ++++++++++--------- src/register/register-gnome/pricecell-gnome.c | 7 ++- .../register-gnome/quickfillcell-gnome.c | 7 ++- 10 files changed, 67 insertions(+), 57 deletions(-) diff --git a/src/gnome-utils/gnc-date-edit.c b/src/gnome-utils/gnc-date-edit.c index 1f93258a0e..411e8b1e94 100644 --- a/src/gnome-utils/gnc-date-edit.c +++ b/src/gnome-utils/gnc-date-edit.c @@ -37,6 +37,7 @@ #include #include +#include #include #include /* atoi */ #include /* isdigit */ @@ -193,9 +194,9 @@ key_press_popup (GtkWidget *widget, GdkEventKey *event, gpointer data) { GNCDateEdit *gde = data; - if (event->keyval != GDK_Return && - event->keyval != GDK_KP_Enter && - event->keyval != GDK_Escape) + if (event->keyval != GDK_KEY_Return && + event->keyval != GDK_KEY_KP_Enter && + event->keyval != GDK_KEY_Escape) return date_accel_key_press(gde->date_entry, event, data); gde = data; diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c index c03759dab8..8ea386bfb3 100644 --- a/src/gnome-utils/gnc-main-window.c +++ b/src/gnome-utils/gnc-main-window.c @@ -36,6 +36,7 @@ #include #include +#include #include #include "guile-mappings.h" @@ -2078,7 +2079,7 @@ gnc_main_window_tab_entry_key_press_event (GtkWidget *entry, GdkEventKey *event, GncPluginPage *page) { - if (event->keyval == GDK_Escape) + if (event->keyval == GDK_KEY_Escape) { GtkWidget *label, *entry2; diff --git a/src/register/register-gnome/combocell-gnome.c b/src/register/register-gnome/combocell-gnome.c index a9c476cec5..c0eadca230 100644 --- a/src/register/register-gnome/combocell-gnome.c +++ b/src/register/register-gnome/combocell-gnome.c @@ -37,6 +37,7 @@ #include #include +#include #include "QuickFill.h" #include "combocell.h" @@ -205,7 +206,7 @@ key_press_item_cb (GncItemList *item_list, GdkEventKey *event, gpointer data) switch (event->keyval) { - case GDK_Escape: + case GDK_KEY_Escape: gnc_item_edit_hide_popup (box->item_edit); box->list_popped = FALSE; break; @@ -605,7 +606,7 @@ gnc_combo_cell_direct_update (BasicCell *bcell, unicode_value = gdk_keyval_to_unicode(event->keyval); switch (event->keyval) { - case GDK_slash: + case GDK_KEY_slash: if (!(event->state & GDK_MOD1_MASK)) { if (unicode_value == box->complete_char) @@ -615,8 +616,8 @@ gnc_combo_cell_direct_update (BasicCell *bcell, } keep_on_going = TRUE; /* fall through */ - case GDK_Tab: - case GDK_ISO_Left_Tab: + case GDK_KEY_Tab: + case GDK_KEY_ISO_Left_Tab: if (!(event->state & GDK_CONTROL_MASK) && !keep_on_going) return FALSE; diff --git a/src/register/register-gnome/datecell-gnome.c b/src/register/register-gnome/datecell-gnome.c index afc9b80733..fb327f2bc7 100644 --- a/src/register/register-gnome/datecell-gnome.c +++ b/src/register/register-gnome/datecell-gnome.c @@ -37,6 +37,7 @@ #include #include #include +#include #include "datecell.h" #include "dialog-utils.h" @@ -249,7 +250,7 @@ key_press_item_cb (GNCDatePicker *gdp, GdkEventKey *event, gpointer data) switch (event->keyval) { - case GDK_Escape: + case GDK_KEY_Escape: gnc_item_edit_hide_popup (box->item_edit); box->calendar_popped = FALSE; break; diff --git a/src/register/register-gnome/formulacell-gnome.c b/src/register/register-gnome/formulacell-gnome.c index d1ac1809bd..1b04d1a261 100644 --- a/src/register/register-gnome/formulacell-gnome.c +++ b/src/register/register-gnome/formulacell-gnome.c @@ -30,6 +30,7 @@ #include #include +#include #include "gnc-engine.h" @@ -79,13 +80,13 @@ gnc_formula_cell_direct_update( BasicCell *bcell, #endif switch (event->keyval) { - case GDK_Return: + case GDK_KEY_Return: if (!(event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_SHIFT_MASK))) is_return = TRUE; /* FALL THROUGH */ - case GDK_KP_Enter: + case GDK_KEY_KP_Enter: { gnc_formula_cell_set_value( cell, cell->cell.value ); @@ -96,7 +97,7 @@ gnc_formula_cell_direct_update( BasicCell *bcell, return !is_return; } - case GDK_KP_Decimal: + case GDK_KEY_KP_Decimal: break; default: diff --git a/src/register/register-gnome/gnucash-date-picker.c b/src/register/register-gnome/gnucash-date-picker.c index c3e72120fc..82ea56e06e 100644 --- a/src/register/register-gnome/gnucash-date-picker.c +++ b/src/register/register-gnome/gnucash-date-picker.c @@ -28,6 +28,7 @@ #include +#include #include "gnucash-date-picker.h" @@ -89,18 +90,18 @@ gnc_date_picker_key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) switch (event->keyval) { - case GDK_Return: - case GDK_KP_Enter: + case GDK_KEY_Return: + case GDK_KEY_KP_Enter: g_signal_emit (date_picker, gnc_date_picker_signals[DATE_PICKED], 0); g_signal_stop_emission_by_name (widget, "key_press_event"); return TRUE; - case GDK_Up: - case GDK_Down: - case GDK_Left: - case GDK_Right: - case GDK_space: + case GDK_KEY_Up: + case GDK_KEY_Down: + case GDK_KEY_Left: + case GDK_KEY_Right: + case GDK_KEY_space: /* these go to the calendar */ return FALSE; diff --git a/src/register/register-gnome/gnucash-item-list.c b/src/register/register-gnome/gnucash-item-list.c index 8c93517933..bc7a6b9fe6 100644 --- a/src/register/register-gnome/gnucash-item-list.c +++ b/src/register/register-gnome/gnucash-item-list.c @@ -31,6 +31,7 @@ #include #include +#include #include "gnc-engine.h" #include "gnucash-item-list.h" @@ -307,7 +308,7 @@ gnc_item_list_key_event (GtkWidget *widget, GdkEventKey *event, gpointer data) switch (event->keyval) { - case GDK_Return: + case GDK_KEY_Return: selection = gtk_tree_view_get_selection (item_list->tree_view); if (!gtk_tree_selection_get_selected (selection, &model, &iter)) return FALSE; @@ -321,10 +322,10 @@ gnc_item_list_key_event (GtkWidget *widget, GdkEventKey *event, gpointer data) g_free(string); return TRUE; - case GDK_Page_Up: - case GDK_Page_Down: - case GDK_Up: - case GDK_Down: + case GDK_KEY_Page_Up: + case GDK_KEY_Page_Down: + case GDK_KEY_Up: + case GDK_KEY_Down: /* These go to the clist */ return FALSE; } diff --git a/src/register/register-gnome/gnucash-sheet.c b/src/register/register-gnome/gnucash-sheet.c index 0cc444fb7c..82663da0f5 100644 --- a/src/register/register-gnome/gnucash-sheet.c +++ b/src/register/register-gnome/gnucash-sheet.c @@ -31,6 +31,7 @@ #include "config.h" #include #include +#include #include "gnucash-sheet.h" @@ -1591,24 +1592,24 @@ gnucash_sheet_clipboard_event (GnucashSheet *sheet, GdkEventKey *event) switch (event->keyval) { - case GDK_C: - case GDK_c: + case GDK_KEY_C: + case GDK_KEY_c: if (event->state & GDK_CONTROL_MASK) { gnc_item_edit_copy_clipboard(item_edit, time); handled = TRUE; } break; - case GDK_X: - case GDK_x: + case GDK_KEY_X: + case GDK_KEY_x: if (event->state & GDK_CONTROL_MASK) { gnc_item_edit_cut_clipboard(item_edit, time); handled = TRUE; } break; - case GDK_V: - case GDK_v: + case GDK_KEY_V: + case GDK_KEY_v: if (event->state & GDK_CONTROL_MASK) { gnc_item_edit_paste_selection (item_edit, GDK_SELECTION_CLIPBOARD, @@ -1616,7 +1617,7 @@ gnucash_sheet_clipboard_event (GnucashSheet *sheet, GdkEventKey *event) handled = TRUE; } break; - case GDK_Insert: + case GDK_KEY_Insert: if (event->state & GDK_SHIFT_MASK) { gnc_item_edit_paste_selection (item_edit, GDK_SELECTION_CLIPBOARD, @@ -1745,13 +1746,13 @@ gnucash_sheet_key_press_event_internal (GtkWidget *widget, GdkEventKey *event) { switch (event->keyval) { - case GDK_Return: - case GDK_KP_Enter: + case GDK_KEY_Return: + case GDK_KEY_KP_Enter: g_signal_emit_by_name(sheet->reg, "activate_cursor"); return TRUE; break; - case GDK_Tab: - case GDK_ISO_Left_Tab: + case GDK_KEY_Tab: + case GDK_KEY_ISO_Left_Tab: if (event->state & GDK_SHIFT_MASK) { direction = GNC_TABLE_TRAVERSE_LEFT; @@ -1765,8 +1766,8 @@ gnucash_sheet_key_press_event_internal (GtkWidget *widget, GdkEventKey *event) TRUE); } break; - case GDK_KP_Page_Up: - case GDK_Page_Up: + case GDK_KEY_KP_Page_Up: + case GDK_KEY_Page_Up: direction = GNC_TABLE_TRAVERSE_UP; new_virt_loc.phys_col_offset = 0; if (event->state & GDK_SHIFT_MASK) @@ -1778,8 +1779,8 @@ gnucash_sheet_key_press_event_internal (GtkWidget *widget, GdkEventKey *event) (table, &new_virt_loc, -distance); } break; - case GDK_KP_Page_Down: - case GDK_Page_Down: + case GDK_KEY_KP_Page_Down: + case GDK_KEY_Page_Down: direction = GNC_TABLE_TRAVERSE_DOWN; new_virt_loc.phys_col_offset = 0; if (event->state & GDK_SHIFT_MASK) @@ -1792,15 +1793,15 @@ gnucash_sheet_key_press_event_internal (GtkWidget *widget, GdkEventKey *event) (table, &new_virt_loc, distance); } break; - case GDK_KP_Up: - case GDK_Up: + case GDK_KEY_KP_Up: + case GDK_KEY_Up: direction = GNC_TABLE_TRAVERSE_UP; gnc_table_move_vertical_position (table, &new_virt_loc, -1); break; - case GDK_KP_Down: - case GDK_Down: - case GDK_Menu: + case GDK_KEY_KP_Down: + case GDK_KEY_Down: + case GDK_KEY_Menu: if (event->keyval == GDK_Menu || event->state & GDK_CONTROL_MASK) { @@ -1819,12 +1820,12 @@ gnucash_sheet_key_press_event_internal (GtkWidget *widget, GdkEventKey *event) gnc_table_move_vertical_position (table, &new_virt_loc, 1); break; - case GDK_Control_L: - case GDK_Control_R: - case GDK_Shift_L: - case GDK_Shift_R: - case GDK_Alt_L: - case GDK_Alt_R: + case GDK_KEY_Control_L: + case GDK_KEY_Control_R: + case GDK_KEY_Shift_L: + case GDK_KEY_Shift_R: + case GDK_KEY_Alt_L: + case GDK_KEY_Alt_R: pass_on = TRUE; break; default: @@ -1892,7 +1893,7 @@ gnucash_sheet_key_press_event (GtkWidget *widget, GdkEventKey *event) else { sheet->shift_state = event->state & GDK_SHIFT_MASK; - sheet->keyval_state = (event->keyval == GDK_KP_Decimal) ? GDK_KP_Decimal : 0; + sheet->keyval_state = (event->keyval == GDK_KEY_KP_Decimal) ? GDK_KEY_KP_Decimal : 0; } if (gtk_im_context_filter_keypress (sheet->im_context, event)) { diff --git a/src/register/register-gnome/pricecell-gnome.c b/src/register/register-gnome/pricecell-gnome.c index ea17ceb5cf..324cc684b4 100644 --- a/src/register/register-gnome/pricecell-gnome.c +++ b/src/register/register-gnome/pricecell-gnome.c @@ -30,6 +30,7 @@ #include #include +#include #include "gnc-locale-utils.h" #include "gnc-exp-parser.h" @@ -67,13 +68,13 @@ gnc_price_cell_direct_update (BasicCell *bcell, #endif switch (event->keyval) { - case GDK_Return: + case GDK_KEY_Return: if (!(event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_SHIFT_MASK))) is_return = TRUE; /* fall through */ - case GDK_KP_Enter: + case GDK_KEY_KP_Enter: { char *error_loc; gnc_numeric amount; @@ -111,7 +112,7 @@ gnc_price_cell_direct_update (BasicCell *bcell, return !is_return; } - case GDK_KP_Decimal: + case GDK_KEY_KP_Decimal: break; default: diff --git a/src/register/register-gnome/quickfillcell-gnome.c b/src/register/register-gnome/quickfillcell-gnome.c index bf26376964..b98c9b838f 100644 --- a/src/register/register-gnome/quickfillcell-gnome.c +++ b/src/register/register-gnome/quickfillcell-gnome.c @@ -31,6 +31,7 @@ #include #include +#include #include "quickfillcell.h" #include "quickfillcell-gnome.h" @@ -54,12 +55,12 @@ gnc_quickfill_cell_direct_update (BasicCell *bcell, switch (event->keyval) { - case GDK_slash: + case GDK_KEY_slash: if (!(event->state & GDK_MOD1_MASK)) return FALSE; break; - case GDK_Tab: - case GDK_ISO_Left_Tab: + case GDK_KEY_Tab: + case GDK_KEY_ISO_Left_Tab: if (!(event->state & GDK_CONTROL_MASK)) return FALSE; break;