r22357 - gnucash/trunk/src - Replace deprecated GDK_* with GDK_KEY_*

Geert Janssens gjanssens at code.gnucash.org
Wed Sep 5 06:44:51 EDT 2012


Author: gjanssens
Date: 2012-09-05 06:44:51 -0400 (Wed, 05 Sep 2012)
New Revision: 22357
Trac: http://svn.gnucash.org/trac/changeset/22357

Modified:
   gnucash/trunk/src/gnome-utils/gnc-date-edit.c
   gnucash/trunk/src/gnome-utils/gnc-main-window.c
   gnucash/trunk/src/register/register-gnome/combocell-gnome.c
   gnucash/trunk/src/register/register-gnome/datecell-gnome.c
   gnucash/trunk/src/register/register-gnome/formulacell-gnome.c
   gnucash/trunk/src/register/register-gnome/gnucash-date-picker.c
   gnucash/trunk/src/register/register-gnome/gnucash-item-list.c
   gnucash/trunk/src/register/register-gnome/gnucash-sheet.c
   gnucash/trunk/src/register/register-gnome/pricecell-gnome.c
   gnucash/trunk/src/register/register-gnome/quickfillcell-gnome.c
Log:
Replace deprecated GDK_* with GDK_KEY_*

Modified: gnucash/trunk/src/gnome-utils/gnc-date-edit.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-date-edit.c	2012-09-05 10:44:39 UTC (rev 22356)
+++ gnucash/trunk/src/gnome-utils/gnc-date-edit.c	2012-09-05 10:44:51 UTC (rev 22357)
@@ -37,6 +37,7 @@
 
 #include <gnome.h>
 #include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
 #include <string.h>
 #include <stdlib.h> /* atoi */
 #include <ctype.h> /* isdigit */
@@ -193,9 +194,9 @@
 {
     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;

Modified: gnucash/trunk/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-main-window.c	2012-09-05 10:44:39 UTC (rev 22356)
+++ gnucash/trunk/src/gnome-utils/gnc-main-window.c	2012-09-05 10:44:51 UTC (rev 22357)
@@ -36,6 +36,7 @@
 
 #include <gnome.h>
 #include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
 #include <libguile.h>
 #include "guile-mappings.h"
 
@@ -2078,7 +2079,7 @@
         GdkEventKey *event,
         GncPluginPage *page)
 {
-    if (event->keyval == GDK_Escape)
+    if (event->keyval == GDK_KEY_Escape)
     {
         GtkWidget *label, *entry2;
 

Modified: gnucash/trunk/src/register/register-gnome/combocell-gnome.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/combocell-gnome.c	2012-09-05 10:44:39 UTC (rev 22356)
+++ gnucash/trunk/src/register/register-gnome/combocell-gnome.c	2012-09-05 10:44:51 UTC (rev 22357)
@@ -37,6 +37,7 @@
 
 #include <gnome.h>
 #include <string.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "QuickFill.h"
 #include "combocell.h"
@@ -205,7 +206,7 @@
 
     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 @@
     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 @@
         }
         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;

Modified: gnucash/trunk/src/register/register-gnome/datecell-gnome.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/datecell-gnome.c	2012-09-05 10:44:39 UTC (rev 22356)
+++ gnucash/trunk/src/register/register-gnome/datecell-gnome.c	2012-09-05 10:44:51 UTC (rev 22357)
@@ -37,6 +37,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "datecell.h"
 #include "dialog-utils.h"
@@ -249,7 +250,7 @@
 
     switch (event->keyval)
     {
-    case GDK_Escape:
+    case GDK_KEY_Escape:
         gnc_item_edit_hide_popup (box->item_edit);
         box->calendar_popped = FALSE;
         break;

Modified: gnucash/trunk/src/register/register-gnome/formulacell-gnome.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/formulacell-gnome.c	2012-09-05 10:44:39 UTC (rev 22356)
+++ gnucash/trunk/src/register/register-gnome/formulacell-gnome.c	2012-09-05 10:44:51 UTC (rev 22357)
@@ -30,6 +30,7 @@
 
 #include <gnome.h>
 #include <locale.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "gnc-engine.h"
 
@@ -79,13 +80,13 @@
 #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 @@
         return !is_return;
     }
 
-    case GDK_KP_Decimal:
+    case GDK_KEY_KP_Decimal:
         break;
 
     default:

Modified: gnucash/trunk/src/register/register-gnome/gnucash-date-picker.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/gnucash-date-picker.c	2012-09-05 10:44:39 UTC (rev 22356)
+++ gnucash/trunk/src/register/register-gnome/gnucash-date-picker.c	2012-09-05 10:44:51 UTC (rev 22357)
@@ -28,6 +28,7 @@
 
 #include <gnome.h>
 
+#include <gdk/gdkkeysyms.h>
 #include "gnucash-date-picker.h"
 
 
@@ -89,18 +90,18 @@
 
     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;
 

Modified: gnucash/trunk/src/register/register-gnome/gnucash-item-list.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/gnucash-item-list.c	2012-09-05 10:44:39 UTC (rev 22356)
+++ gnucash/trunk/src/register/register-gnome/gnucash-item-list.c	2012-09-05 10:44:51 UTC (rev 22357)
@@ -31,6 +31,7 @@
 
 #include <gnome.h>
 #include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "gnc-engine.h"
 #include "gnucash-item-list.h"
@@ -307,7 +308,7 @@
 
     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 @@
         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;
     }

Modified: gnucash/trunk/src/register/register-gnome/gnucash-sheet.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/gnucash-sheet.c	2012-09-05 10:44:39 UTC (rev 22356)
+++ gnucash/trunk/src/register/register-gnome/gnucash-sheet.c	2012-09-05 10:44:51 UTC (rev 22357)
@@ -31,6 +31,7 @@
 #include "config.h"
 #include <glib.h>
 #include <glib/gprintf.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "gnucash-sheet.h"
 
@@ -1591,24 +1592,24 @@
 
     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 @@
             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 @@
     {
         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 @@
                                     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 @@
                 (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 @@
                 (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 @@
             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 @@
     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))
     {

Modified: gnucash/trunk/src/register/register-gnome/pricecell-gnome.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/pricecell-gnome.c	2012-09-05 10:44:39 UTC (rev 22356)
+++ gnucash/trunk/src/register/register-gnome/pricecell-gnome.c	2012-09-05 10:44:51 UTC (rev 22357)
@@ -30,6 +30,7 @@
 
 #include <gnome.h>
 #include <locale.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "gnc-locale-utils.h"
 #include "gnc-exp-parser.h"
@@ -67,13 +68,13 @@
 #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 @@
         return !is_return;
     }
 
-    case GDK_KP_Decimal:
+    case GDK_KEY_KP_Decimal:
         break;
 
     default:

Modified: gnucash/trunk/src/register/register-gnome/quickfillcell-gnome.c
===================================================================
--- gnucash/trunk/src/register/register-gnome/quickfillcell-gnome.c	2012-09-05 10:44:39 UTC (rev 22356)
+++ gnucash/trunk/src/register/register-gnome/quickfillcell-gnome.c	2012-09-05 10:44:51 UTC (rev 22357)
@@ -31,6 +31,7 @@
 
 #include <gnome.h>
 #include <string.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "quickfillcell.h"
 #include "quickfillcell-gnome.h"
@@ -54,12 +55,12 @@
 
     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;



More information about the gnucash-changes mailing list