Mercurial > mxe-octave

annotate src/msvc-zenity-1.patch @ 7207:9ed6500e56d3 default tip @

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge release to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 17 May 2024 20:16:41 +0200
parents a791ade9c790
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3178
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
1 diff -ur zenity-3.8.0-orig/src/main.c zenity-3.8.0/src/main.c
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
2 --- zenity-3.8.0-orig/src/main.c 2011-08-16 09:52:42 -0400
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
3 +++ zenity-3.8.0/src/main.c 2013-07-25 19:58:10 -0400
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
4 @@ -29,7 +29,9 @@
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
5 #include <stdlib.h>
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
6 #include <glib.h>
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
7 #include <gtk/gtk.h>
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
8 +#ifndef _MSC_VER
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
9 #include <langinfo.h>
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
10 +#endif
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
11 #ifdef HAVE_LOCALE_H
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
12 #include <locale.h>
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
13 #endif
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
14 diff -ur zenity-3.8.0-orig/src/option.c zenity-3.8.0/src/option.c
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
15 --- zenity-3.8.0-orig/src/option.c 2013-03-13 21:46:04 -0400
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
16 +++ zenity-3.8.0/src/option.c 2013-07-25 19:58:10 -0400
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
17 @@ -1621,7 +1621,11 @@
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
18 if (zenity_calendar_date_format)
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
19 results->calendar_data->date_format = zenity_calendar_date_format;
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
20 else
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
21 +#ifdef _MSC_VER
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
22 + results->calendar_data->date_format = "%Y-%m-%d";
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
23 +#else
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
24 results->calendar_data->date_format = g_locale_to_utf8 (nl_langinfo (D_FMT), -1, NULL, NULL, NULL);
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
25 +#endif
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
26
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
27 } else {
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
28 if (zenity_calendar_day > -1)
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
29 @@ -2009,7 +2013,11 @@
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
30 if (zenity_forms_date_format)
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
31 results->forms_data->date_format = zenity_forms_date_format;
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
32 else
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
33 +#ifdef _MSC_VER
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
34 + results->forms_data->date_format = "%Y-%m-%d";
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
35 +#else
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
36 results->forms_data->date_format = g_locale_to_utf8 (nl_langinfo (D_FMT), -1, NULL, NULL, NULL);
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
37 +#endif
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
38 } else {
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
39 if (zenity_forms_date_format)
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
40 zenity_option_error (zenity_option_get_name (forms_dialog_options, &zenity_forms_date_format),
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
41 diff -ur zenity-3.8.0-orig/src/option.h zenity-3.8.0/src/option.h
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
42 --- zenity-3.8.0-orig/src/option.h 2011-08-16 09:52:42 -0400
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
43 +++ zenity-3.8.0/src/option.h 2013-07-25 19:58:10 -0400
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
44 @@ -27,7 +27,9 @@
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
45
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
46 #include "zenity.h"
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
47 #include <glib.h>
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
48 +#ifndef _MSC_VER
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
49 #include <langinfo.h>
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
50 +#endif
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
51 #ifdef HAVE_LOCALE_H
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
52 #include <locale.h>
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
53 #endif
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
54 diff -ur zenity-3.8.0-orig/src/progress.c zenity-3.8.0/src/progress.c
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
55 --- zenity-3.8.0-orig/src/progress.c 2013-03-13 21:46:04 -0400
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
56 +++ zenity-3.8.0/src/progress.c 2013-07-25 19:58:10 -0400
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
57 @@ -327,9 +327,11 @@
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
58 But we want to give people the option to choose this behavior.
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
59 -- Monday 27, March 2006
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
60 */
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
61 +#ifndef _MSC_VER
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
62 if (autokill) {
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
63 kill (getppid (), 1);
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
64 }
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
65 +#endif
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
66 zen_data->exit_code = zenity_util_return_exit_code (ZENITY_CANCEL);
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
67 break;
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
68
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
69 diff -ur zenity-3.8.0-orig/src/tree.c zenity-3.8.0/src/tree.c
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
70 --- zenity-3.8.0-orig/src/tree.c 2013-03-13 21:46:04 -0400
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
71 +++ zenity-3.8.0/src/tree.c 2013-07-25 19:58:38 -0400
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
72 @@ -643,6 +643,7 @@
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
73 GObject *tree_view;
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
74 GtkTreeSelection *selection;
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
75 GtkTreeModel *model;
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
76 + GSList *tmp;
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
77
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
78 tree_view = gtk_builder_get_object (builder, "zenity_tree_view");
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
79 model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree_view));
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
80 @@ -657,8 +658,6 @@
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
81 GTK_TREE_VIEW (tree_view));
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
82 }
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
83
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
84 - GSList *tmp;
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
85 -
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
86 for (tmp = selected; tmp; tmp = tmp->next) {
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
87 if (tmp->next != NULL) {
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
88 g_print ("%s%s", (gchar *) tmp->data, separator);
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
89 diff -ur zenity-3.8.0-orig/src/util.c zenity-3.8.0/src/util.c
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
90 --- zenity-3.8.0-orig/src/util.c 2013-03-13 21:46:04 -0400
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
91 +++ zenity-3.8.0/src/util.c 2013-07-25 19:58:10 -0400
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
92 @@ -89,9 +89,20 @@
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
93 }
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
94
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
95 if (result == 0)
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
96 +#ifdef G_OS_WIN32
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
97 + {
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
98 + gchar *root = g_win32_get_package_installation_directory_of_module (NULL);
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
99 + gchar *p = g_build_filename (root, "share/zenity/zenity.ui");
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
100 + result = gtk_builder_add_objects_from_file (builder, p,
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
101 + objects, &error);
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
102 + g_free (p);
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
103 + g_free (root);
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
104 + }
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
105 +#else
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
106 result = gtk_builder_add_objects_from_file (builder,
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
107 ZENITY_UI_FILE_FULLPATH,
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
108 objects, &error);
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
109 +#endif
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
110
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
111 g_strfreev (objects);
a791ade9c790 add zenity module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
112