From 8b4592e0b2748defac7e39ff542af677738b6862 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Fri, 20 May 2011 10:11:56 +0200 Subject: [PATCH] More integration with win32. --- Makefile.am | 2 +- configure.ac | 19 +++++++++++--- src/Makefile.am | 22 +++++++++++------ src/gtkdateentry.c | 56 ++++++++++++++++++++++++++++++++++++------ tests/plugin_gtkform.c | 9 ++++++- 5 files changed, 88 insertions(+), 20 deletions(-) diff --git a/Makefile.am b/Makefile.am index a070418..2623cb7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc -if GLADEUI +if GLADEUI_FOUND SUBDIRS_GLADE = glade else SUBDIRS_GLADE = diff --git a/configure.ac b/configure.ac index 8be725a..6a27c74 100644 --- a/configure.ac +++ b/configure.ac @@ -30,11 +30,11 @@ AC_STRUCT_TM GTK_DOC_CHECK(1.0) PKG_CHECK_MODULES(GTKDATEENTRY, [gtk+-2.0 >= 2.6.8 - libgtkmaskedentry >= 0.0.1]) + libgtkmaskedentry >= 0.0.3]) PKG_CHECK_EXISTS(gladeui-1.0 >= 3.2.0, [GLADEUI_FOUND=yes], [GLADEUI_FOUND=no]) PKG_CHECK_EXISTS(libgtkform >= 0.2.0, [LIBGTKFORM_FOUND=yes], [LIBGTKFORM_FOUND=no]) -AM_CONDITIONAL(GLADEUI, test $GLADEUI_FOUND = yes) +AM_CONDITIONAL(GLADEUI_FOUND, test $GLADEUI_FOUND = yes) AM_CONDITIONAL(LIBGTKFORM_FOUND, test $LIBGTKFORM_FOUND = yes) AC_SUBST(GTKDATEENTRY_CFLAGS) @@ -45,9 +45,22 @@ PKG_CHECK_MODULES(GTKFORM, libgtkform >= 0.2.0) AC_SUBST(GTKFORM_CFLAGS) AC_SUBST(GTKFORM_LIBS) -AC_SUBST(LIBGTKFORM_FOUND) fi +dnl ****************************** +dnl Check for Operating System +dnl ****************************** + +platform_win32=no + +case "$host" in +*-mingw*) + platform_win32=yes + ;; +esac + +AM_CONDITIONAL(PLATFORM_WIN32, [test $platform_win32 = yes]) + # Output files AC_CONFIG_FILES([ libgtkdateentry.pc diff --git a/src/Makefile.am b/src/Makefile.am index e30cc51..367eac2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,6 +16,14 @@ GTKFORM_H = libgtkformmodulesdir = endif +if PLATFORM_WIN32 +libmodulesext = -0.dll +libmodulesdir = $(bindir) +else +libmodulesext = .so +libmodulesdir = $(libdir) +endif + lib_LTLIBRARIES = libgtkdateentry.la libgtkdateentry_la_SOURCES = gtkdateentry.c \ @@ -26,13 +34,13 @@ libgtkdateentry_la_LDFLAGS = -no-undefined include_HEADERS = gtkdateentry.h \ $(GTKFORM_H) +if LIBGTKFORM_FOUND install-exec-hook: - if test "x$(LIBGTKFORM_FOUND)" = "xyes"; then \ - cd $(libgtkformmodulesdir) && \ - ln -s -f $(libdir)/libgtkdateentry.so .; \ - fi + cd $(libgtkformmodulesdir) && \ + ln -s -f $(libmodulesdir)/libgtkdateentry$(libmodulesext) . +endif +if LIBGTKFORM_FOUND uninstall-hook: - if test "x$(LIBGTKFORM_FOUND)" = "xyes"; then \ - rm -f $(libgtkformmodulesdir)/libgtkdateentry.so - fi + rm -f $(libgtkformmodulesdir)/libgtkdateentry$(libmodulesext) +endif diff --git a/src/gtkdateentry.c b/src/gtkdateentry.c index f50c0b9..a242f30 100644 --- a/src/gtkdateentry.c +++ b/src/gtkdateentry.c @@ -19,13 +19,22 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H + #include +#endif + #include -#include #include - #include +#ifdef G_OS_WIN32 +#include +#include +#else +#include +#endif + #include #include "gtkdateentry.h" @@ -155,9 +164,6 @@ gtk_date_entry_init (GtkDateEntry *date) GtkDateEntryPrivate *priv = GTK_DATE_ENTRY_GET_PRIVATE (date); - /* TO DO - * read separator and format from locale settings - */ priv->separator = gtk_date_entry_get_separator_from_locale (); priv->format = gtk_date_entry_get_format_from_locale (); @@ -1083,7 +1089,23 @@ static gchar fmt = NULL; +#ifdef G_OS_WIN32 + + gchar lpLCData[30]; + + if (GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_SSHORTDATE, (LPTSTR)&lpLCData, 30) == 0) + { + g_warning ("Unable to get locale information"); + return NULL; + } + lfmt = g_strdup ((const gchar *)&lpLCData); + +#else + lfmt = nl_langinfo (D_FMT); + +#endif + l = strlen (lfmt); for (i = 0; i < l; i++) { @@ -1117,23 +1139,41 @@ static gchar fmt = NULL; +#ifdef G_OS_WIN32 + + gchar lpLCData[30]; + + if (GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_SSHORTDATE, (LPTSTR)&lpLCData, 30) == 0) + { + g_warning ("Unable to get locale information"); + return NULL; + } + lfmt = g_strdup ((const gchar *)&lpLCData); + +#else + lfmt = nl_langinfo (D_FMT); + +#endif + l = strlen (lfmt); for (i = 0; i < l; i++) { switch (lfmt[i]) { case 'd': - fmt = g_strconcat (fmt == NULL ? "" : fmt, "d", NULL); + case 'D': + fmt = g_strconcat (fmt == NULL ? "" : fmt, fmt != NULL && strchr (fmt, 'd') != 0 ? "" : "d", NULL); break; case 'm': - fmt = g_strconcat (fmt == NULL ? "" : fmt, "m", NULL); + case 'M': + fmt = g_strconcat (fmt == NULL ? "" : fmt, fmt != NULL && strchr (fmt, 'm') != 0 ? "" : "m", NULL); break; case 'y': case 'Y': - fmt = g_strconcat (fmt == NULL ? "" : fmt, "Y", NULL); + fmt = g_strconcat (fmt == NULL ? "" : fmt, fmt != NULL && strchr (fmt, 'Y') != 0 ? "" : "Y", NULL); break; } } diff --git a/tests/plugin_gtkform.c b/tests/plugin_gtkform.c index 87f5bc6..ae63640 100644 --- a/tests/plugin_gtkform.c +++ b/tests/plugin_gtkform.c @@ -1,6 +1,6 @@ /* * GtkDateEntry widget test - plugin for libgtkform - * Copyright (C) 2010 Andrea Zagli + * Copyright (C) 2010-2011 Andrea Zagli * * This software is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -55,6 +55,13 @@ main (int argc, char **argv) gtk_init (&argc, &argv); +#ifdef G_OS_WIN32 + gchar *libname = "libgtkmaskedentry-0.dll"; + g_module_open (g_build_filename (g_getenv ("LIBGTKFORM_MODULESDIR"), libname, NULL), G_MODULE_BIND_LAZY); + libname = g_strdup ("libgtkdateentry-0.dll"); + g_module_open (g_build_filename (g_getenv ("LIBGTKFORM_MODULESDIR"), libname, NULL), G_MODULE_BIND_LAZY); +#endif + error = NULL; builder = gtk_builder_new (); gtk_builder_add_from_file (builder, "plugin_gtkform.ui", &error); -- 2.49.0