diff options
Diffstat (limited to 'libmate-desktop/mate-colorsel.c')
-rw-r--r-- | libmate-desktop/mate-colorsel.c | 78 |
1 files changed, 19 insertions, 59 deletions
diff --git a/libmate-desktop/mate-colorsel.c b/libmate-desktop/mate-colorsel.c index 8f01a61..1790cbf 100644 --- a/libmate-desktop/mate-colorsel.c +++ b/libmate-desktop/mate-colorsel.c @@ -32,11 +32,6 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#if GTK_CHECK_VERSION (3, 0, 0) -#include <gdk/gdkkeysyms-compat.h> -#else -#include <gdkconfig.h> -#endif #include <glib/gi18n-lib.h> #include "mate-colorsel.h" @@ -138,11 +133,7 @@ struct _ColorSelectionPrivate }; -#if GTK_CHECK_VERSION (3, 0, 0) static void mate_color_selection_dispose (GObject *object); -#else -static void mate_color_selection_destroy (GtkObject *object); -#endif static void mate_color_selection_finalize (GObject *object); static void update_color (MateColorSelection *colorsel); static void mate_color_selection_set_property (GObject *object, @@ -294,9 +285,6 @@ static void mate_color_selection_class_init (MateColorSelectionClass *klass) { GObjectClass *gobject_class; -#if !GTK_CHECK_VERSION (3, 0, 0) - GtkObjectClass *object_class; -#endif GtkWidgetClass *widget_class; gobject_class = G_OBJECT_CLASS (klass); @@ -304,12 +292,7 @@ mate_color_selection_class_init (MateColorSelectionClass *klass) gobject_class->set_property = mate_color_selection_set_property; gobject_class->get_property = mate_color_selection_get_property; -#if GTK_CHECK_VERSION (3, 0, 0) gobject_class->dispose = mate_color_selection_dispose; -#else - object_class = GTK_OBJECT_CLASS (klass); - object_class->destroy = mate_color_selection_destroy; -#endif widget_class = GTK_WIDGET_CLASS (klass); widget_class->realize = mate_color_selection_realize; @@ -348,11 +331,7 @@ mate_color_selection_class_init (MateColorSelectionClass *klass) color_selection_signals[COLOR_CHANGED] = g_signal_new ("color-changed", -#if GTK_CHECK_VERSION (3, 0, 0) G_OBJECT_CLASS_TYPE (gobject_class), -#else - G_OBJECT_CLASS_TYPE (object_class), -#endif G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (MateColorSelectionClass, color_changed), NULL, NULL, @@ -616,7 +595,6 @@ mate_color_selection_get_property (GObject *object, } } -#if GTK_CHECK_VERSION (3, 0, 0) static void mate_color_selection_dispose (GObject *object) { @@ -631,24 +609,6 @@ mate_color_selection_dispose (GObject *object) G_OBJECT_CLASS (mate_color_selection_parent_class)->dispose (object); } -#else -/* GtkObject methods */ - -static void -mate_color_selection_destroy (GtkObject *object) -{ - MateColorSelection *cselection = MATE_COLOR_SELECTION (object); - ColorSelectionPrivate *priv = cselection->private_data; - - if (priv->dropper_grab_widget) - { - gtk_widget_destroy (priv->dropper_grab_widget); - priv->dropper_grab_widget = NULL; - } - - GTK_OBJECT_CLASS (mate_color_selection_parent_class)->destroy (object); -} -#endif /* GtkWidget methods */ @@ -1664,11 +1624,11 @@ palette_activate (GtkWidget *widget, gpointer data) { /* should have a drawing area subclass with an activate signal */ - if ((event->keyval == GDK_space) || - (event->keyval == GDK_Return) || - (event->keyval == GDK_ISO_Enter) || - (event->keyval == GDK_KP_Enter) || - (event->keyval == GDK_KP_Space)) + if ((event->keyval == GDK_KEY_space) || + (event->keyval == GDK_KEY_Return) || + (event->keyval == GDK_KEY_ISO_Enter) || + (event->keyval == GDK_KEY_KP_Enter) || + (event->keyval == GDK_KEY_KP_Space)) { if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "color_set")) != 0) { @@ -1974,15 +1934,15 @@ key_press (GtkWidget *invisible, switch (event->keyval) { - case GDK_space: - case GDK_Return: - case GDK_ISO_Enter: - case GDK_KP_Enter: - case GDK_KP_Space: + case GDK_KEY_space: + case GDK_KEY_Return: + case GDK_KEY_ISO_Enter: + case GDK_KEY_KP_Enter: + case GDK_KEY_KP_Space: grab_color_at_mouse (screen, x, y, data); /* fall through */ - case GDK_Escape: + case GDK_KEY_Escape: shutdown_eyedropper (data); g_signal_handlers_disconnect_by_func (invisible, @@ -1995,23 +1955,23 @@ key_press (GtkWidget *invisible, return TRUE; #if defined GDK_WINDOWING_X11 || defined GDK_WINDOWING_WIN32 - case GDK_Up: - case GDK_KP_Up: + case GDK_KEY_Up: + case GDK_KEY_KP_Up: dy = state == GDK_MOD1_MASK ? -BIG_STEP : -1; break; - case GDK_Down: - case GDK_KP_Down: + case GDK_KEY_Down: + case GDK_KEY_KP_Down: dy = state == GDK_MOD1_MASK ? BIG_STEP : 1; break; - case GDK_Left: - case GDK_KP_Left: + case GDK_KEY_Left: + case GDK_KEY_KP_Left: dx = state == GDK_MOD1_MASK ? -BIG_STEP : -1; break; - case GDK_Right: - case GDK_KP_Right: + case GDK_KEY_Right: + case GDK_KEY_KP_Right: dx = state == GDK_MOD1_MASK ? BIG_STEP : 1; break; #endif |