]> git.pld-linux.org Git - packages/drgenius.git/blame - drgenius-c++.patch
projects / packages / drgenius.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- converted to UTF-8
[packages/drgenius.git] / drgenius-c++.patch
CommitLineData
283f7472
JB		 1--- drgenius-0.5.10/drgeo/drgeo_figure.cc.orig Sat Nov 11 11:07:18 2000
2+++ drgenius-0.5.10/drgeo/drgeo_figure.cc Fri Apr 2 16:49:50 2004
3@@ -200,6 +200,7 @@
4 int a, nb;
5 geometricObject *fig;
6 gchar *oldlocale;
7+ drgeoVector v1, v2;
8
9
10 if (!(fileHandle = fopen (fileName, "w")))
11@@ -210,8 +211,8 @@
12 setlocale (LC_ALL, "C");
13
14 fprintf (fileHandle, "\\documentclass[a4paper]{minimal}\n\\usepackage{pstricks}\n\\begin{document}\n");
15- latex = new drgeoLatexDrawable (this, fileHandle, area->getAreaCenter (),
16- area->getAreaSize (), 1.0);
17+ latex = new drgeoLatexDrawable (this, fileHandle, (v1 = area->getAreaCenter ()),
18+ (v2 = area->getAreaSize ()), 1.0);
19 /* scan the figure and get the output */
20 nb = figureList.nb_elem;
21 figureList.init_lire ();
22@@ -238,6 +239,7 @@
23 int a, nb;
24 geometricObject *fig;
25 gchar *oldlocale;
26+ drgeoVector v1, v2;
27
28 if (!(fileHandle = fopen (fileName, "w")))
29 return FALSE;
30@@ -245,8 +247,8 @@
31 oldlocale = g_strdup (setlocale (LC_ALL, NULL));
32 setlocale (LC_ALL, "C");
33
34- postscript = new drgeoPostScriptDrawable (this, fileHandle, area->getAreaCenter (),
35- area->getAreaSize (), 1.0);
36+ postscript = new drgeoPostScriptDrawable (this, fileHandle, (v1 = area->getAreaCenter ()),
37+ (v2 = area->getAreaSize ()), 1.0);
38 /* scan the figure and get the output */
39 nb = figureList.nb_elem;
40 figureList.init_lire ();
41--- drgenius-0.5.10/drgeo/drgeo_menu.cc.orig Sat Sep 30 08:10:30 2000
42+++ drgenius-0.5.10/drgeo/drgeo_menu.cc Fri Apr 2 16:52:34 2004
43@@ -77,24 +77,24 @@
44 {
45 {
46 GNOME_APP_UI_ITEM, N_ ("Free _point"),
47- N_ ("Point on an object or the background plane"), drgeo_free_point_cb,
48+ N_ ("Point on an object or the background plane"), (void*)drgeo_free_point_cb,
49 NULL, NULL, (GnomeUIPixmapType) 0, 0, 'p',
50 GDK_CONTROL_MASK
51 },
52 {
53 GNOME_APP_UI_ITEM, N_ ("_Middle"),
54- N_ ("The midpoint of a segment or between two points"), drgeo_middle_point_cb,
55+ N_ ("The midpoint of a segment or between two points"), (void*)drgeo_middle_point_cb,
56 NULL, NULL, (GnomeUIPixmapType) 0, 0, 'm',
57 GDK_CONTROL_MASK
58 },
59 {
60 GNOME_APP_UI_ITEM, N_ ("_Intersection"),
61- N_ ("The point(s) of intersection between two objects"), drgeo_intersection_cb,
62+ N_ ("The point(s) of intersection between two objects"), (void*)drgeo_intersection_cb,
63 NULL, NULL, (GnomeUIPixmapType) 0, 0, 'i', GDK_CONTROL_MASK
64 },
65 {
66 GNOME_APP_UI_ITEM, N_ ("_Coordinates"), N_ ("Point given its coordinates"),
67- drgeo_mark_point_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0
68+ (void*)drgeo_mark_point_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0
69 },
70 GNOMEUIINFO_END
71 };
72@@ -103,39 +103,39 @@
73 {
74 {
75 GNOME_APP_UI_ITEM, N_ ("_Line"), N_ ("Line defined by two points"),
76- drgeo_line_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'd', GDK_CONTROL_MASK
77+ (void*)drgeo_line_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'd', GDK_CONTROL_MASK
78 },
79 {
80 GNOME_APP_UI_ITEM, N_ ("_Half-line"),
81 N_ ("Half-Line defined by two points, the first selected point is the origin"),
82- drgeo_half_line_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'e',
83+ (void*)drgeo_half_line_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'e',
84 GDK_CONTROL_MASK
85 },
86 {
87 GNOME_APP_UI_ITEM, N_ ("_Segment"), N_ ("Segment defined by two points"),
88- drgeo_segment_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 's',
89+ (void*)drgeo_segment_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 's',
90 GDK_CONTROL_MASK
91 },
92 {
93 GNOME_APP_UI_ITEM, N_ ("_Vector"), N_ ("Vector defined by two points"),
94-drgeo_vector_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'v', GDK_CONTROL_MASK
95+(void*)drgeo_vector_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'v', GDK_CONTROL_MASK
96 },
97 {
98 GNOME_APP_UI_ITEM, N_ ("_Circle"),
99 N_ ("Circle defines by center and point, radius or segment"),
100-drgeo_circle_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'c', GDK_CONTROL_MASK
101+(void*)drgeo_circle_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'c', GDK_CONTROL_MASK
102 },
103 {
104 GNOME_APP_UI_ITEM, N_ ("_Arc Circle"),
105 N_ ("Arc circle defined by three points"),
106- drgeo_arc_circle_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'a',
107+ (void*)drgeo_arc_circle_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'a',
108 GDK_CONTROL_MASK
109
110 },
111 {
112 GNOME_APP_UI_ITEM, N_ ("_Geometric locus"),
113 N_ ("Locus defined by a free point and a relative point"),
114- drgeo_locus_point_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'l',
115+ (void*)drgeo_locus_point_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'l',
116 GDK_CONTROL_MASK
117 },
118 GNOMEUIINFO_END
119@@ -146,40 +146,40 @@
120 {
121 GNOME_APP_UI_ITEM, N_ ("_Parallel line"),
122 N_ ("Line passing through one point and parallel to a line, half-line, etc."),
123- drgeo_parallel_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'r',
124+ (void*)drgeo_parallel_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'r',
125 GDK_CONTROL_MASK
126 },
127 {
128 GNOME_APP_UI_ITEM, N_ ("_Orthogonal line"),
129 N_ ("Line passing through one point and orthogonal to a line, half-line, etc."),
130- drgeo_orthogonal_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'o',
131+ (void*)drgeo_orthogonal_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'o',
132 GDK_CONTROL_MASK
133 },
134 {
135 GNOME_APP_UI_ITEM, N_ ("_Axial symmetry"),
136 N_ ("Axial symmetry of an object. When ambiguity, the first selected line is the line to transform"),
137- drgeo_reflexion_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0
138+ (void*)drgeo_reflexion_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0
139 },
140 {
141 GNOME_APP_UI_ITEM, N_ ("_Central symmetry"),
142 N_ ("Central symmetry of an object. When ambiguity, the first selected point is the point to transform"),
143- drgeo_symmetry_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0
144+ (void*)drgeo_symmetry_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0
145 },
146 {
147 GNOME_APP_UI_ITEM, N_ ("_Translation"),
148 N_ ("Translation of an object. When ambiguity, the first selected vector is the vector to translate"),
149- drgeo_translation_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 't',
150+ (void*)drgeo_translation_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 't',
151 GDK_CONTROL_MASK
152 },
153 {
154 GNOME_APP_UI_ITEM, N_ ("_Rotation"),
155 N_ ("Rotation of an object. When ambiguity, the first selected point is the point to rotate"),
156- drgeo_rotation_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0
157+ (void*)drgeo_rotation_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0
158 },
159 {
160 GNOME_APP_UI_ITEM, N_ ("_Scale"),
161 N_ ("Scale an object. When ambiguity, the first selected point is the point to transform"),
162- drgeo_scale_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'h', GDK_CONTROL_MASK
163+ (void*)drgeo_scale_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'h', GDK_CONTROL_MASK
164 },
165 GNOMEUIINFO_END
166 };
167@@ -189,18 +189,18 @@
168 {
169 GNOME_APP_UI_ITEM, N_ ("_Distance & length"),
170 N_ ("Distance between objects, curve length, or edit free value"),
171- drgeo_numeric_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'n',
172+ (void*)drgeo_numeric_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'n',
173 GDK_CONTROL_MASK
174 },
175 {
176 GNOME_APP_UI_ITEM, N_ ("_Angle"),
177 N_ ("Angle defined by three points or two vectors"),
178- drgeo_angle_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'g', GDK_CONTROL_MASK
179+ (void*)drgeo_angle_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'g', GDK_CONTROL_MASK
180 },
181 {
182 GNOME_APP_UI_ITEM, N_ ("_Coordinates & equation"),
183 N_ ("Vector and point coordinates, line and circle equation"),
184- drgeo_coordinates_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0
185+ (void*)drgeo_coordinates_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0
186 },
187 GNOMEUIINFO_END
188 };
189@@ -209,12 +209,12 @@
190 {
191 {
192 GNOME_APP_UI_ITEM, N_ ("_Construct macro"), N_ ("Construct a macro"),
193- drgeo_macro_build_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0
194+ (void*)drgeo_macro_build_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0
195 },
196 {
197 GNOME_APP_UI_ITEM, N_ ("_Execute macro"),
198 N_ ("Execute pre-built macro"),
199- drgeo_macro_play_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0
200+ (void*)drgeo_macro_play_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0
201 },
202 GNOMEUIINFO_END
203 };
204@@ -222,21 +222,21 @@
205 static GnomeUIInfo zoom_value[] =
206 {
207 GNOMEUIINFO_RADIOITEM (N_ ("Default 100%"), N_ ("Zoom to 100%"),
208- drgeo_zoom_100_cb, NULL),
209+ (void*)drgeo_zoom_100_cb, NULL),
210 GNOMEUIINFO_RADIOITEM ("200%", N_ ("Zoom to 200%"),
211- drgeo_zoom_200_cb, NULL),
212+ (void*)drgeo_zoom_200_cb, NULL),
213 GNOMEUIINFO_RADIOITEM ("175%", N_ ("Zoom to 175%"),
214- drgeo_zoom_175_cb, NULL),
215+ (void*)drgeo_zoom_175_cb, NULL),
216 GNOMEUIINFO_RADIOITEM ("150%", N_ ("Zoom to 150%"),
217- drgeo_zoom_150_cb, NULL),
218+ (void*)drgeo_zoom_150_cb, NULL),
219 GNOMEUIINFO_RADIOITEM ("125%", N_ ("Zoom to 125%"),
220- drgeo_zoom_125_cb, NULL),
221+ (void*)drgeo_zoom_125_cb, NULL),
222 GNOMEUIINFO_RADIOITEM ("75%", N_ ("Zoom to 75%"),
223- drgeo_zoom_75_cb, NULL),
224+ (void*)drgeo_zoom_75_cb, NULL),
225 GNOMEUIINFO_RADIOITEM ("50%", N_ ("Zoom to 50%"),
226- drgeo_zoom_50_cb, NULL),
227+ (void*)drgeo_zoom_50_cb, NULL),
228 GNOMEUIINFO_RADIOITEM ("25%", N_ ("Zoom to 25%"),
229- drgeo_zoom_25_cb, NULL),
230+ (void*)drgeo_zoom_25_cb, NULL),
231 GNOMEUIINFO_END
232 };
233
234@@ -258,17 +258,17 @@
235 {
236 GNOME_APP_UI_ITEM, N_ ("M_ove an object"),
237 N_ ("Select and move an object"),
238- drgeo_select_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'm', GDK_MOD1_MASK
239+ (void*)drgeo_select_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'm', GDK_MOD1_MASK
240 },
241 {
242 GNOME_APP_UI_ITEM, N_ ("_Delete an object"),
243 N_ ("Delete an object and its relatives"),
244- drgeo_delete_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'd', GDK_MOD1_MASK
245+ (void*)drgeo_delete_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 'd', GDK_MOD1_MASK
246 },
247 {
248 GNOME_APP_UI_ITEM, N_ ("_Style"),
249 N_ ("Change the style of an object"),
250- drgeo_style_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 's', GDK_MOD1_MASK
251+ (void*)drgeo_style_cb, NULL, NULL, (GnomeUIPixmapType) 0, 0, 's', GDK_MOD1_MASK
252 },
253 GNOMEUIINFO_END
254 };
255--- drgenius-0.5.10/drgeo/xml.cc.orig Sat Nov 11 09:20:30 2000
256+++ drgenius-0.5.10/drgeo/xml.cc Fri Apr 2 16:53:03 2004
257@@ -24,6 +24,7 @@
258 */
259
260 #include <stdlib.h>
261+#include <string.h>
262
263 #include "xml.h"
264
General tool for mathematics
This page took 0.072945 seconds and 4 git commands to generate.