1 |
ottxor 13/03/04 01:46:09 |
2 |
|
3 |
Added: xfig-3.2.5b-darwin.patch xfig-3.2.5b-solaris.patch |
4 |
xfig-3.2.5b-edit-menu.patch |
5 |
Log: |
6 |
fixed bugs #412753 and #405475, added prefix support |
7 |
|
8 |
(Portage version: 2.2.0_alpha165/cvs/Linux x86_64, signed Manifest commit with key C2000586) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 media-gfx/xfig/files/xfig-3.2.5b-darwin.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/files/xfig-3.2.5b-darwin.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/files/xfig-3.2.5b-darwin.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: xfig-3.2.5b-darwin.patch |
17 |
=================================================================== |
18 |
--- fig.h |
19 |
+++ fig.h |
20 |
@@ -374,7 +374,7 @@ |
21 |
extern long random(); |
22 |
extern void srandom(unsigned int); |
23 |
|
24 |
-#elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux) && !defined(__FreeBSD__) && !defined(__GLIBC__) |
25 |
+#elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux) && !defined(__FreeBSD__) && !defined(__DARWIN__) && !defined(__GLIBC__) |
26 |
extern void srandom(int); |
27 |
|
28 |
#endif |
29 |
--- w_keyboard.c |
30 |
+++ w_keyboard.c |
31 |
@@ -41,7 +41,7 @@ |
32 |
#define REG_NOERROR REG_OKAY |
33 |
#endif |
34 |
|
35 |
-#if defined(__FreeBSD__) && !defined(REG_NOERROR) |
36 |
+#if (defined(__FreeBSD__) || defined(__DARWIN__)) && !defined(REG_NOERROR) |
37 |
#define REG_NOERROR 0 |
38 |
#endif |
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.1 media-gfx/xfig/files/xfig-3.2.5b-solaris.patch |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/files/xfig-3.2.5b-solaris.patch?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/files/xfig-3.2.5b-solaris.patch?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: xfig-3.2.5b-solaris.patch |
49 |
=================================================================== |
50 |
* workaround some missing things on Solaris |
51 |
|
52 |
--- u_quartic.c |
53 |
+++ u_quartic.c |
54 |
@@ -21,4 +21,7 @@ |
55 |
#include <math.h> |
56 |
|
57 |
+ #ifndef M_PI |
58 |
+ # define M_PI 3.14159265358979323846 |
59 |
+ #endif |
60 |
|
61 |
static int |
62 |
--- w_intersect.c |
63 |
+++ w_intersect.c |
64 |
@@ -31,6 +31,11 @@ |
65 |
#define ISET_P1 (1 << 0) |
66 |
#define ISET_P2 (1 << 1) |
67 |
|
68 |
+#if defined (__SVR4) && defined (__sun) |
69 |
+#undef _Complex_I |
70 |
+#define _Complex_I (__extension__ 1.0fi) |
71 |
+#endif |
72 |
+ |
73 |
intersect_state_e intersect_state = INTERSECT_INITIAL; |
74 |
|
75 |
static INLINE Boolean |
76 |
|
77 |
|
78 |
|
79 |
1.1 media-gfx/xfig/files/xfig-3.2.5b-edit-menu.patch |
80 |
|
81 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/files/xfig-3.2.5b-edit-menu.patch?rev=1.1&view=markup |
82 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/files/xfig-3.2.5b-edit-menu.patch?rev=1.1&content-type=text/plain |
83 |
|
84 |
Index: xfig-3.2.5b-edit-menu.patch |
85 |
=================================================================== |
86 |
diff -Naur /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/Imakefile /root/xfig.3.2.5b/Imakefile |
87 |
--- /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/Imakefile 2012-04-20 09:46:26.217957716 +0200 |
88 |
+++ /root/xfig.3.2.5b/Imakefile 2012-04-20 09:16:28.744362135 +0200 |
89 |
@@ -251,7 +251,7 @@ |
90 |
#endif /* USEJPEG */ |
91 |
|
92 |
#ifdef I18N |
93 |
-I18N_DEFS = -DI18N -DSETLOCALE |
94 |
+I18N_DEFS = -DI18N -DSETLOCALE -DXAW_INTERNATIONALIZATION |
95 |
I18N_SRC = w_i18n.c |
96 |
I18N_OBJ = w_i18n.o |
97 |
#endif |
98 |
diff -Naur /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/e_edit.c /root/xfig.3.2.5b/e_edit.c |
99 |
--- /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/e_edit.c 2007-04-04 18:18:32.000000000 +0200 |
100 |
+++ /root/xfig.3.2.5b/e_edit.c 2012-04-20 10:02:04.209542848 +0200 |
101 |
@@ -3211,7 +3211,7 @@ |
102 |
XtAddCallback(but1, XtNcallback, |
103 |
(XtCallbackProc) grab_button, (XtPointer) NULL); |
104 |
|
105 |
- if ( cur_image_editor != NULL && *cur_image_editor != (char) NULL) { |
106 |
+ if ( cur_image_editor != NULL && *cur_image_editor != '\0' ) { |
107 |
FirstArg(XtNlabel,"Edit Image"); |
108 |
NextArg(XtNfromHoriz, but1); |
109 |
NextArg(XtNfromVert, label); |
110 |
@@ -3501,7 +3501,7 @@ |
111 |
{ |
112 |
Widget but_spline[3]; |
113 |
Dimension label_height, label_width; |
114 |
- int i, dist; |
115 |
+ int i, dist; |
116 |
|
117 |
static char use_item[]="Edit the behavior\nof the control point"; |
118 |
|
119 |
@@ -3598,7 +3598,7 @@ |
120 |
below = but_spline[i] = XtCreateManagedWidget(sfactor_type[i].label, |
121 |
commandWidgetClass, form, Args, ArgCount); |
122 |
XtAddCallback(but_spline[i], XtNcallback, |
123 |
- (XtCallbackProc) toggle_sfactor_type, (XtPointer) i); |
124 |
+ (XtCallbackProc) toggle_sfactor_type, (XtPointer) (intptr_t) i); |
125 |
XtSetArg(Args[0], XtNfromVert, below); /* here are the direct */ |
126 |
XtSetArg(Args[1], XtNvertDistance, 3 * dist); /* accesses to Args */ |
127 |
} |
128 |
@@ -3608,7 +3608,7 @@ |
129 |
static void |
130 |
toggle_sfactor_type(Widget panel_local, XtPointer _sfactor_index, XtPointer call_data) |
131 |
{ |
132 |
- int sfactor_index = (int) _sfactor_index; |
133 |
+ int sfactor_index = (int) (intptr_t) _sfactor_index; |
134 |
|
135 |
update_sfactor_value(sfactor_type[sfactor_index].value); |
136 |
XawScrollbarSetThumb(sfactor_bar, |
137 |
@@ -3629,10 +3629,10 @@ |
138 |
static void |
139 |
scroll_sfactor_value(Widget panel_local, XtPointer closure, XtPointer _num_pixels) |
140 |
{ |
141 |
- int *num_pixels = (int *) _num_pixels; |
142 |
+ int num_pixels = (int) (intptr_t) _num_pixels; |
143 |
|
144 |
update_sfactor_value(sub_sfactor->s + |
145 |
- (STEP_VALUE * SFACTOR_SIGN((int) num_pixels))); |
146 |
+ (STEP_VALUE * SFACTOR_SIGN(num_pixels))); |
147 |
XawScrollbarSetThumb(panel_local, SFACTOR_TO_PERCENTAGE(sub_sfactor->s), |
148 |
THUMB_H); |
149 |
} |
150 |
@@ -4031,7 +4031,6 @@ |
151 |
Widget |
152 |
color_selection_panel(char *label, char *wname, char *name, Widget parent, Widget below, Widget beside, Widget *button, Widget *popup, int color, XtCallbackProc callback) |
153 |
{ |
154 |
- |
155 |
FirstArg(XtNfromVert, below); |
156 |
NextArg(XtNborderWidth, 0); |
157 |
NextArg(XtNtop, XtChainBottom); |
158 |
@@ -4057,7 +4056,7 @@ |
159 |
* callback |
160 |
*/ |
161 |
/* also set the label */ |
162 |
- (callback)(below, (XtPointer) color, NULL); |
163 |
+ (callback)(below, (XtPointer) (intptr_t) color, NULL); |
164 |
*popup = make_color_popup_menu(below, name, callback, NO_TRANSP, NO_BACKG); |
165 |
|
166 |
return *button; |
167 |
@@ -4658,7 +4657,7 @@ |
168 |
int ival; |
169 |
double val; |
170 |
|
171 |
- new_points_units = (int) new_unit; |
172 |
+ new_points_units = (int) (intptr_t) new_unit; |
173 |
if (points_units == new_points_units) |
174 |
return; |
175 |
|
176 |
@@ -4739,7 +4738,7 @@ |
177 |
FirstArg(XtNlabel, XtName(w)); |
178 |
SetValues(arc_type_panel); |
179 |
|
180 |
- generic_vals.arc_type = (int) new_style; |
181 |
+ generic_vals.arc_type = (int) (intptr_t) new_style; |
182 |
/* if now a pie-wedge type, make the arrow panels insensitive */ |
183 |
if (generic_vals.arc_type == T_PIE_WEDGE_ARC) { |
184 |
/* unmanage arrow forms */ |
185 |
@@ -4865,7 +4864,7 @@ |
186 |
static void |
187 |
pen_color_select(Widget w, XtPointer new_color, XtPointer call_data) |
188 |
{ |
189 |
- pen_color = (Color) new_color; |
190 |
+ pen_color = (Color) (intptr_t) new_color; |
191 |
color_select(pen_col_button, pen_color); |
192 |
if (pen_color_popup) { |
193 |
XtPopdown(pen_color_popup); |
194 |
@@ -4875,7 +4874,7 @@ |
195 |
static void |
196 |
fill_color_select(Widget w, XtPointer new_color, XtPointer call_data) |
197 |
{ |
198 |
- fill_color = (Color) new_color; |
199 |
+ fill_color = (Color) (intptr_t) new_color; |
200 |
color_select(fill_col_button, fill_color); |
201 |
if (fill_color_popup) { |
202 |
XtPopdown(fill_color_popup); |
203 |
@@ -4927,7 +4926,7 @@ |
204 |
{ |
205 |
FirstArg(XtNlabel, XtName(w)); |
206 |
SetValues(hidden_text_panel); |
207 |
- hidden_text_flag = (int) new_hidden_text; |
208 |
+ hidden_text_flag = (int) (intptr_t) new_hidden_text; |
209 |
} |
210 |
|
211 |
static void |
212 |
@@ -4935,7 +4934,7 @@ |
213 |
{ |
214 |
FirstArg(XtNlabel, XtName(w)); |
215 |
SetValues(rigid_text_panel); |
216 |
- rigid_text_flag = (int) new_rigid_text; |
217 |
+ rigid_text_flag = (int) (intptr_t) new_rigid_text; |
218 |
} |
219 |
|
220 |
static void |
221 |
@@ -4943,7 +4942,7 @@ |
222 |
{ |
223 |
FirstArg(XtNlabel, XtName(w)); |
224 |
SetValues(special_text_panel); |
225 |
- special_text_flag = (int) new_special_text; |
226 |
+ special_text_flag = (int) (intptr_t) new_special_text; |
227 |
} |
228 |
|
229 |
static void |
230 |
@@ -4951,7 +4950,7 @@ |
231 |
{ |
232 |
FirstArg(XtNlabel, XtName(w)); |
233 |
SetValues(textjust_panel); |
234 |
- textjust = (int) new_textjust; |
235 |
+ textjust = (int) (intptr_t) new_textjust; |
236 |
} |
237 |
|
238 |
static void |
239 |
@@ -4963,7 +4962,7 @@ |
240 |
|
241 |
FirstArg(XtNlabel, XtName(w)); |
242 |
SetValues(flip_pic_panel); |
243 |
- flip_pic_flag = (int) new_flipflag; |
244 |
+ flip_pic_flag = (int) (intptr_t) new_flipflag; |
245 |
p1.x = panel_get_dim_value(x1_panel); |
246 |
p1.y = panel_get_dim_value(y1_panel); |
247 |
p2.x = panel_get_dim_value(x2_panel); |
248 |
@@ -4996,7 +4995,7 @@ |
249 |
FirstArg(XtNlabel, XtName(w)); |
250 |
SetValues(rotation_panel); |
251 |
/* get new rotation (0 = 0 degrees, 1 = 90, 2 = 180, 3 = 270) */ |
252 |
- rotation = (int) new_rotation; |
253 |
+ rotation = (int) (intptr_t) new_rotation; |
254 |
|
255 |
/* get the two opposite corners */ |
256 |
p1.x = panel_get_dim_value(x1_panel); |
257 |
@@ -5104,7 +5103,7 @@ |
258 |
|
259 |
FirstArg(XtNlabel, XtName(w)); |
260 |
SetValues(fill_style_button); |
261 |
- fill_flag = (int) new_fillflag; |
262 |
+ fill_flag = (int) (intptr_t) new_fillflag; |
263 |
|
264 |
if (fill_flag == 0) { |
265 |
/* no fill; blank out fill density value and pattern */ |
266 |
diff -Naur /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/u_draw.c /root/xfig.3.2.5b/u_draw.c |
267 |
--- /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/u_draw.c 2007-04-04 18:18:32.000000000 +0200 |
268 |
+++ /root/xfig.3.2.5b/u_draw.c 2012-04-20 09:20:31.379714332 +0200 |
269 |
@@ -603,7 +603,7 @@ |
270 |
/* is it a picture object or a Fig figure? */ |
271 |
if (line->type == T_PICTURE) { |
272 |
if (line->pic->pic_cache) { |
273 |
- if ((line->pic->pic_cache->bitmap != (Pixmap) NULL) && active_layer(line->depth)) { |
274 |
+ if ((line->pic->pic_cache->bitmap != NULL) && active_layer(line->depth)) { |
275 |
/* only draw the picture if there is a pixmap AND this layer is active */ |
276 |
draw_pic_pixmap(line, op); |
277 |
return; |
278 |
diff -Naur /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_cmdpanel.c /root/xfig.3.2.5b/w_cmdpanel.c |
279 |
--- /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_cmdpanel.c 2008-07-17 17:50:06.000000000 +0200 |
280 |
+++ /root/xfig.3.2.5b/w_cmdpanel.c 2012-04-20 09:54:55.595198185 +0200 |
281 |
@@ -1581,7 +1581,7 @@ |
282 |
beside = XtCreateManagedWidget("char_button", commandWidgetClass, |
283 |
character_map_panel, Args, ArgCount); |
284 |
/* add callback to paste character into current text */ |
285 |
- XtAddCallback(beside, XtNcallback, paste_char, (XtPointer) i); |
286 |
+ XtAddCallback(beside, XtNcallback, paste_char, (XtPointer) (intptr_t) i); |
287 |
/* skip empty entries and 127 (delete) */ |
288 |
if (i==126) { |
289 |
below = beside; |
290 |
diff -Naur /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_color.c /root/xfig.3.2.5b/w_color.c |
291 |
--- /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_color.c 2007-04-04 18:18:32.000000000 +0200 |
292 |
+++ /root/xfig.3.2.5b/w_color.c 2012-04-20 09:23:24.738775166 +0200 |
293 |
@@ -334,7 +334,7 @@ |
294 |
} else { |
295 |
NextArg(XtNstate, True); /* start with edit pen */ |
296 |
} |
297 |
- NextArg(XtNradioData, (XtPointer) (i+1)); /* can't use 0 */ |
298 |
+ NextArg(XtNradioData, (XtPointer) (intptr_t) (i+1)); /* can't use 0 */ |
299 |
mixedEdit[i] = XtCreateManagedWidget("mixedEdit", toggleWidgetClass, |
300 |
mixedForm[i], Args, ArgCount); |
301 |
XtAddCallback(mixedEdit[i], XtNcallback, switch_edit, (XtPointer) 0); |
302 |
@@ -807,7 +807,7 @@ |
303 |
set_slider_sensitivity(); |
304 |
|
305 |
/* activate the one the user pressed (pen or fill) */ |
306 |
- XawToggleSetCurrent(mixedEdit[0],(XtPointer) (func==I_PEN_COLOR? 1:2)); |
307 |
+ XawToggleSetCurrent(mixedEdit[0],(XtPointer) (intptr_t) (func==I_PEN_COLOR? 1:2)); |
308 |
} |
309 |
|
310 |
void restore_mixed_colors(void) |
311 |
diff -Naur /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_export.c /root/xfig.3.2.5b/w_export.c |
312 |
--- /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_export.c 2007-09-19 21:32:30.000000000 +0200 |
313 |
+++ /root/xfig.3.2.5b/w_export.c 2012-04-20 09:24:09.181867729 +0200 |
314 |
@@ -384,7 +384,7 @@ |
315 |
change_orient(); |
316 |
appres.landscape = (int) client_data; |
317 |
/* make sure that paper size is appropriate */ |
318 |
- papersize_select(export_papersize_panel, (XtPointer) appres.papersize, (XtPointer) 0); |
319 |
+ papersize_select(export_papersize_panel, (XtPointer) (intptr_t) appres.papersize, (XtPointer) 0); |
320 |
} |
321 |
} |
322 |
|
323 |
diff -Naur /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_fontpanel.c /root/xfig.3.2.5b/w_fontpanel.c |
324 |
--- /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_fontpanel.c 2007-04-04 18:18:32.000000000 +0200 |
325 |
+++ /root/xfig.3.2.5b/w_fontpanel.c 2012-04-20 09:26:50.774325641 +0200 |
326 |
@@ -142,14 +142,14 @@ |
327 |
ps_fontmenu_items[i].type = MENU_IMAGESTRING; /* put the fontnames in |
328 |
* menu */ |
329 |
ps_fontmenu_items[i].label = ps_fontinfo[i].name; |
330 |
- ps_fontmenu_items[i].info = (caddr_t) (i - 1); /* index for font # */ |
331 |
+ ps_fontmenu_items[i].info = (caddr_t) (intptr_t) (i - 1); /* index for font # */ |
332 |
} |
333 |
|
334 |
for (i = 0; i < NUM_LATEX_FONTS; i++) { |
335 |
latex_fontmenu_items[i].type = MENU_IMAGESTRING; /* put the fontnames in |
336 |
* menu */ |
337 |
latex_fontmenu_items[i].label = latex_fontinfo[i].name; |
338 |
- latex_fontmenu_items[i].info = (caddr_t) i; /* index for font # */ |
339 |
+ latex_fontmenu_items[i].info = (caddr_t) (intptr_t) i; /* index for font # */ |
340 |
} |
341 |
|
342 |
pane_actions = XtParseTranslationTable("<EnterWindow>:set()\n\ |
343 |
@@ -352,9 +352,9 @@ |
344 |
char *font_name = mi->label; |
345 |
|
346 |
if (*flag_sel) |
347 |
- *font_ps_sel = (int) mi->info; /* set ps font to one selected */ |
348 |
+ *font_ps_sel = (int) (intptr_t) mi->info; /* set ps font to one selected */ |
349 |
else |
350 |
- *font_latex_sel = (int) mi->info; /* set latex font to one |
351 |
+ *font_latex_sel = (int) (intptr_t) mi->info; /* set latex font to one |
352 |
* selected */ |
353 |
put_msg("Font: %s", font_name); |
354 |
/* put image of font in indicator window */ |
355 |
diff -Naur /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_indpanel.c /root/xfig.3.2.5b/w_indpanel.c |
356 |
--- /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_indpanel.c 2009-03-30 17:54:00.000000000 +0200 |
357 |
+++ /root/xfig.3.2.5b/w_indpanel.c 2012-04-20 09:34:38.181793478 +0200 |
358 |
@@ -2692,7 +2692,7 @@ |
359 |
/* "Ticks" checkbutton */ |
360 |
below = CreateCheckbutton("Show ticks", "ticks", tickform, below, (Widget) NULL, |
361 |
MANAGE, LARGE_CHK, &dimline_ticks, |
362 |
- dimline_panel_preview, (Widget) NULL); |
363 |
+ dimline_panel_preview, (Widget*) NULL); |
364 |
|
365 |
/* Tick Thickness label */ |
366 |
FirstArg(XtNlabel, "Thickness"); |
367 |
diff -Naur /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_print.c /root/xfig.3.2.5b/w_print.c |
368 |
--- /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_print.c 2009-04-20 18:26:14.000000000 +0200 |
369 |
+++ /root/xfig.3.2.5b/w_print.c 2012-04-20 09:36:11.004623947 +0200 |
370 |
@@ -407,7 +407,7 @@ |
371 |
change_orient(); |
372 |
appres.landscape = (int) new_orient; |
373 |
/* make sure that paper size is appropriate */ |
374 |
- papersize_select(print_papersize_panel, (XtPointer) appres.papersize, (XtPointer) 0); |
375 |
+ papersize_select(print_papersize_panel, (XtPointer) (intptr_t) appres.papersize, (XtPointer) 0); |
376 |
} |
377 |
} |
378 |
|
379 |
@@ -771,7 +771,7 @@ |
380 |
for (i = 0; i < XtNumber(paper_sizes); i++) { |
381 |
entry = XtCreateManagedWidget(paper_sizes[i].fname, smeBSBObjectClass, |
382 |
papersize_menu, NULL, ZERO); |
383 |
- XtAddCallback(entry, XtNcallback, papersize_select, (XtPointer) i); |
384 |
+ XtAddCallback(entry, XtNcallback, papersize_select, (XtPointer) (intptr_t) i); |
385 |
} |
386 |
|
387 |
/* Orientation */ |
388 |
diff -Naur /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_util.c /root/xfig.3.2.5b/w_util.c |
389 |
--- /var/tmp/portage/media-gfx/xfig-3.2.5b-r2/work/xfig.3.2.5b/w_util.c 2009-03-30 17:52:38.000000000 +0200 |
390 |
+++ /root/xfig.3.2.5b/w_util.c 2012-04-20 09:37:37.764153931 +0200 |
391 |
@@ -378,7 +378,7 @@ |
392 |
} |
393 |
entry = XtCreateManagedWidget(entries[i], smeBSBObjectClass, pulldown_menu, |
394 |
NULL, ZERO); |
395 |
- XtAddCallback(entry, XtNcallback, callback, (XtPointer) i); |
396 |
+ XtAddCallback(entry, XtNcallback, callback, (XtPointer) (intptr_t) i); |
397 |
} |
398 |
return pulldown_menu; |
399 |
} |
400 |
@@ -488,7 +488,7 @@ |
401 |
NextArg(XtNbackground, black_color.pixel); |
402 |
} |
403 |
entry = XtCreateManagedWidget(buf, commandWidgetClass, pop_form, Args, ArgCount); |
404 |
- XtAddCallback(entry, XtNcallback, callback, (XtPointer) i); |
405 |
+ XtAddCallback(entry, XtNcallback, callback, (XtPointer) (intptr_t) i); |
406 |
} |
407 |
|
408 |
/* make a scrollable viewport in case all the buttons don't fit */ |
409 |
@@ -545,7 +545,7 @@ |
410 |
} |
411 |
entry = XtCreateManagedWidget(buf, commandWidgetClass, color_box, |
412 |
Args, ArgCount); |
413 |
- XtAddCallback(entry, XtNcallback, callback, (XtPointer) i); |
414 |
+ XtAddCallback(entry, XtNcallback, callback, (XtPointer) (intptr_t) i); |
415 |
} |
416 |
|
417 |
/* make the cancel button */ |