#include <windows.h>
#endif
-#include <glib/gprintf.h>
-
#undef GTK_DISABLE_DEPRECATED
#include "gtkcalendar.h"
-#define GTK_DISABLE_DEPRECATED
#include "gtkdnd.h"
#include "gtkintl.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
#include "gtkprivate.h"
-#include "gtkintl.h"
#include "gdk/gdkkeysyms.h"
#include "gtkalias.h"
#define DAY_XSEP 0 /* not really good for small calendar */
#define DAY_YSEP 0 /* not really good for small calendar */
+#define SCROLL_DELAY_FACTOR 5
+
/* Color usage */
#define HEADER_FG_COLOR(widget) (& (widget)->style->fg[GTK_WIDGET_STATE (widget)])
#define HEADER_BG_COLOR(widget) (& (widget)->style->bg[GTK_WIDGET_STATE (widget)])
time_t secs;
struct tm *tm;
gint i;
- char buffer[255];
#ifdef G_OS_WIN32
wchar_t wbuffer[100];
#else
+ char buffer[255];
time_t tmp_time;
#endif
GtkCalendarPrivate *priv;
strftime ( buffer, sizeof (buffer), "%a", gmtime (&tmp_time));
default_abbreviated_dayname[i] = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
#else
- if (G_WIN32_HAVE_WIDECHAR_API ())
- {
- if (!GetLocaleInfoW (GetThreadLocale (), LOCALE_SABBREVDAYNAME1 + (i+6)%7,
- wbuffer, G_N_ELEMENTS (wbuffer)))
- default_abbreviated_dayname[i] = g_strdup_printf ("(%d)", i);
- else
- default_abbreviated_dayname[i] = g_utf16_to_utf8 (wbuffer, -1, NULL, NULL, NULL);
- }
+ if (!GetLocaleInfoW (GetThreadLocale (), LOCALE_SABBREVDAYNAME1 + (i+6)%7,
+ wbuffer, G_N_ELEMENTS (wbuffer)))
+ default_abbreviated_dayname[i] = g_strdup_printf ("(%d)", i);
else
- {
- if (!GetLocaleInfoA (GetThreadLocale (),
- (LOCALE_SABBREVDAYNAME1 + (i+6)%7) | LOCALE_USE_CP_ACP,
- buffer, G_N_ELEMENTS (buffer)))
- default_abbreviated_dayname[i] = g_strdup_printf ("(%d)", i);
- else
- default_abbreviated_dayname[i] = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
- }
+ default_abbreviated_dayname[i] = g_utf16_to_utf8 (wbuffer, -1, NULL, NULL, NULL);
#endif
}
strftime ( buffer, sizeof (buffer), "%B", gmtime (&tmp_time));
default_monthname[i] = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
#else
- if (G_WIN32_HAVE_WIDECHAR_API ())
- {
- if (!GetLocaleInfoW (GetThreadLocale (), LOCALE_SMONTHNAME1 + i,
- wbuffer, G_N_ELEMENTS (wbuffer)))
- default_monthname[i] = g_strdup_printf ("(%d)", i);
- else
- default_monthname[i] = g_utf16_to_utf8 (wbuffer, -1, NULL, NULL, NULL);
- }
+ if (!GetLocaleInfoW (GetThreadLocale (), LOCALE_SMONTHNAME1 + i,
+ wbuffer, G_N_ELEMENTS (wbuffer)))
+ default_monthname[i] = g_strdup_printf ("(%d)", i);
else
- {
- if (!GetLocaleInfoA (GetThreadLocale (),
- (LOCALE_SMONTHNAME1 + i) | LOCALE_USE_CP_ACP,
- buffer, G_N_ELEMENTS (buffer)))
- default_monthname[i] = g_strdup_printf ("(%d)", i);
- else
- default_monthname[i] = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
- }
+ default_monthname[i] = g_utf16_to_utf8 (wbuffer, -1, NULL, NULL, NULL);
#endif
}
else if (strcmp (year_before, "calendar:MY") != 0)
g_warning ("Whoever translated calendar:MY did so wrongly.\n");
+#ifdef G_OS_WIN32
+ priv->week_start = 0;
+ week_start = NULL;
+
+ if (GetLocaleInfoW (GetThreadLocale (), LOCALE_IFIRSTDAYOFWEEK,
+ wbuffer, G_N_ELEMENTS (wbuffer)))
+ week_start = g_utf16_to_utf8 (wbuffer, -1, NULL, NULL, NULL);
+
+ if (week_start != NULL)
+ {
+ priv->week_start = (week_start[0] - '0' + 1) % 7;
+ g_free(week_start);
+ }
+#else
#ifdef HAVE__NL_TIME_FIRST_WEEKDAY
langinfo = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
first_weekday = langinfo[0];
g_warning ("Whoever translated calendar:week_start:0 did so wrongly.\n");
priv->week_start = 0;
}
+#endif
#endif
calendar_compute_days (calendar);
/* Translators: this defines whether the week numbers should use
* localized digits or the ones used in English (0123...).
*
- * Translate to "calendar:week:digits|%Id" if you want to use localized
- * digits. Leave it alone to whatever it is otherwise.
+ * Translate to "%Id" if you want to use localized digits, or
+ * translate to "%d" otherwise. Don't include the
+ * "calendar:week:digits|" part in the translation.
*
* Note that translating this doesn't guarantee that you get localized
* digits. That needs support from your system and locale definition
/* Translators: this defines whether the day numbers should use
* localized digits or the ones used in English (0123...).
*
- * Translate to "calendar:day:digits|%Id" if you want to use localized
- * digits. Leave it alone to whatever it is otherwise.
+ * Translate to "%Id" if you want to use localized digits, or
+ * translate to "%d" otherwise. Don't include the "calendar:day:digits|"
+ * part in the translation.
*
* Note that translating this doesn't guarantee that you get localized
* digits. That needs support from your system and locale definition
gtk_paint_arrow (widget->style, window, state,
GTK_SHADOW_OUT, NULL, widget, "calendar",
GTK_ARROW_RIGHT, TRUE,
- width/2 - 2, height/2 - 4, 8, 8);
+ width/2 - 4, height/2 - 4, 8, 8);
}
}
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
gboolean retval = FALSE;
- GDK_THREADS_ENTER ();
-
if (priv->timer)
{
calendar_arrow_action (calendar, priv->click_child);
g_object_get (settings, "gtk-timeout-repeat", &timeout, NULL);
priv->need_timer = FALSE;
- priv->timer = g_timeout_add (timeout,
- (GSourceFunc) calendar_timer,
- (gpointer) calendar);
+ priv->timer = gdk_threads_add_timeout_full (G_PRIORITY_DEFAULT_IDLE,
+ timeout * SCROLL_DELAY_FACTOR,
+ (GSourceFunc) calendar_timer,
+ (gpointer) calendar, NULL);
}
else
retval = TRUE;
}
- GDK_THREADS_LEAVE ();
-
return retval;
}
g_object_get (settings, "gtk-timeout-initial", &timeout, NULL);
priv->need_timer = TRUE;
- priv->timer = g_timeout_add (timeout,
- calendar_timer,
- calendar);
+ priv->timer = gdk_threads_add_timeout_full (G_PRIORITY_DEFAULT_IDLE,
+ timeout,
+ (GSourceFunc) calendar_timer,
+ (gpointer) calendar, NULL);
}
}
case GDK_space:
row = calendar->focus_row;
col = calendar->focus_col;
- day = calendar->day[row][col];
if (row > -1 && col > -1)
{
return_val = TRUE;
+ day = calendar->day[row][col];
if (calendar->day_month[row][col] == MONTH_PREV)
calendar_set_month_prev (calendar);
else if (calendar->day_month[row][col] == MONTH_NEXT)
}
target = gtk_drag_dest_find_target (widget, context, NULL);
- if (target == GDK_NONE)
+ if (target == GDK_NONE || context->suggested_action == 0)
gdk_drag_status (context, 0, time);
else
{