diff options
| author | William Jon McCann <william.jon.mccann@gmail.com> | 2013-07-09 16:44:04 -0400 |
|---|---|---|
| committer | William Jon McCann <william.jon.mccann@gmail.com> | 2013-07-11 17:08:15 -0400 |
| commit | 57fc8763e930911f97b6e9fc9edebafb887db2b3 (patch) | |
| tree | 34e928277f9b2fa4c5fd3e6e4526967c4e0a66a9 /gtk/gtkcalendar.c | |
| parent | 0efeb96dab93f93e15137f5b16a0132e7c9f4369 (diff) | |
| download | gtk+-57fc8763e930911f97b6e9fc9edebafb887db2b3.tar.gz | |
Deprecate and ignore the timeout-initial and timeout-repeat settings
Diffstat (limited to 'gtk/gtkcalendar.c')
| -rw-r--r-- | gtk/gtkcalendar.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index 588a905dc2..2f0646e015 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -81,6 +81,9 @@ #include "gtktooltip.h" #include "gtkprivate.h" +#define TIMEOUT_INITIAL 500 +#define TIMEOUT_REPEAT 50 + /***************************************************************************/ /* The following date routines are taken from the lib_date package. * They have been minimally edited to avoid conflict with types defined @@ -2884,15 +2887,9 @@ calendar_timer (gpointer data) if (priv->need_timer) { - GtkSettings *settings; - guint timeout; - - settings = gtk_widget_get_settings (GTK_WIDGET (calendar)); - g_object_get (settings, "gtk-timeout-repeat", &timeout, NULL); - priv->need_timer = FALSE; priv->timer = gdk_threads_add_timeout_full (G_PRIORITY_DEFAULT_IDLE, - timeout * SCROLL_DELAY_FACTOR, + TIMEOUT_REPEAT * SCROLL_DELAY_FACTOR, (GSourceFunc) calendar_timer, (gpointer) calendar, NULL); } @@ -2913,15 +2910,9 @@ calendar_start_spinning (GtkCalendar *calendar, if (!priv->timer) { - GtkSettings *settings; - guint timeout; - - settings = gtk_widget_get_settings (GTK_WIDGET (calendar)); - g_object_get (settings, "gtk-timeout-initial", &timeout, NULL); - priv->need_timer = TRUE; priv->timer = gdk_threads_add_timeout_full (G_PRIORITY_DEFAULT_IDLE, - timeout, + TIMEOUT_INITIAL, (GSourceFunc) calendar_timer, (gpointer) calendar, NULL); } |