diff options
| author | Colin Walters <walters@verbum.org> | 2010-09-08 13:35:51 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-09-08 18:51:44 -0400 |
| commit | 913cdf3be750a1e74c09b20edf55a57f9a919fcc (patch) | |
| tree | 0d2129a167579c0d896bb9213503619b2ef44d1f /gtk/gtkcalendar.c | |
| parent | 03c19e37af1f7aa9af8a48bcc9dc023397f8693f (diff) | |
| download | gtk+-913cdf3be750a1e74c09b20edf55a57f9a919fcc.tar.gz | |
GDK: Prefix key names with KEY_
The keysyms create a lot of potential namespace conflicts for
C, and are especially problematic for introspection, where we take
constants into the namespace, so GDK_Display conflicts with GdkDisplay.
For C application compatiblity, add gdkkeysyms-compat.h which uses
the old names.
Just one user in GTK+ continues to use gdkkeysyms-compat.h, which is
the gtkimcontextsimple.c, since porting that requires porting more
custom Perl code.
Diffstat (limited to 'gtk/gtkcalendar.c')
| -rw-r--r-- | gtk/gtkcalendar.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index b9057eb3e8..2fe80ff781 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -3367,8 +3367,8 @@ gtk_calendar_key_press (GtkWidget *widget, switch (event->keyval) { - case GDK_KP_Left: - case GDK_Left: + case GDK_KEY_KP_Left: + case GDK_KEY_Left: return_val = TRUE; if (event->state & GDK_CONTROL_MASK) calendar_set_month_prev (calendar); @@ -3380,8 +3380,8 @@ gtk_calendar_key_press (GtkWidget *widget, priv->focus_col); } break; - case GDK_KP_Right: - case GDK_Right: + case GDK_KEY_KP_Right: + case GDK_KEY_Right: return_val = TRUE; if (event->state & GDK_CONTROL_MASK) calendar_set_month_next (calendar); @@ -3393,8 +3393,8 @@ gtk_calendar_key_press (GtkWidget *widget, priv->focus_col); } break; - case GDK_KP_Up: - case GDK_Up: + case GDK_KEY_KP_Up: + case GDK_KEY_Up: return_val = TRUE; if (event->state & GDK_CONTROL_MASK) calendar_set_year_prev (calendar); @@ -3411,8 +3411,8 @@ gtk_calendar_key_press (GtkWidget *widget, priv->focus_col); } break; - case GDK_KP_Down: - case GDK_Down: + case GDK_KEY_KP_Down: + case GDK_KEY_Down: return_val = TRUE; if (event->state & GDK_CONTROL_MASK) calendar_set_year_next (calendar); @@ -3427,8 +3427,8 @@ gtk_calendar_key_press (GtkWidget *widget, priv->focus_col); } break; - case GDK_KP_Space: - case GDK_space: + case GDK_KEY_KP_Space: + case GDK_KEY_space: row = priv->focus_row; col = priv->focus_col; |