Mercurial > projects > doodle
comparison nobuild/gtkd64.diff @ 106:5677ba065636
Added 64-bit GtkD patch submitted by dsimcha on D newsgroup
author | David Bryant <bagnose@gmail.com> |
---|---|
date | Fri, 04 Mar 2011 13:14:04 +1030 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
105:7abaf5c3959f | 106:5677ba065636 |
---|---|
1 Index: src/atk/Relation.d | |
2 =================================================================== | |
3 --- src/atk/Relation.d (revision 797) | |
4 +++ src/atk/Relation.d (working copy) | |
5 @@ -173,7 +173,7 @@ | |
6 targetsArray[i] = targets[i].getObjectAtkStruct(); | |
7 } | |
8 | |
9 - auto p = atk_relation_new(targetsArray.ptr, targets.length, relationship); | |
10 + auto p = atk_relation_new(targetsArray.ptr, cast(gint) targets.length, relationship); | |
11 if(p is null) | |
12 { | |
13 throw new ConstructionException("null returned by atk_relation_new(targetsArray.ptr, targets.length, relationship)"); | |
14 Index: src/atk/StateSet.d | |
15 =================================================================== | |
16 --- src/atk/StateSet.d (revision 797) | |
17 +++ src/atk/StateSet.d (working copy) | |
18 @@ -158,7 +158,7 @@ | |
19 public void addStates(AtkStateType[] types) | |
20 { | |
21 // void atk_state_set_add_states (AtkStateSet *set, AtkStateType *types, gint n_types); | |
22 - atk_state_set_add_states(atkStateSet, types.ptr, types.length); | |
23 + atk_state_set_add_states(atkStateSet, types.ptr, cast(gint) types.length); | |
24 } | |
25 | |
26 /** | |
27 @@ -192,7 +192,7 @@ | |
28 public int containsStates(AtkStateType[] types) | |
29 { | |
30 // gboolean atk_state_set_contains_states (AtkStateSet *set, AtkStateType *types, gint n_types); | |
31 - return atk_state_set_contains_states(atkStateSet, types.ptr, types.length); | |
32 + return atk_state_set_contains_states(atkStateSet, types.ptr, cast(gint) types.length); | |
33 } | |
34 | |
35 /** | |
36 Index: src/gdkpixbuf/PixbufLoader.d | |
37 =================================================================== | |
38 --- src/gdkpixbuf/PixbufLoader.d (revision 797) | |
39 +++ src/gdkpixbuf/PixbufLoader.d (working copy) | |
40 @@ -379,7 +379,7 @@ | |
41 // gboolean gdk_pixbuf_loader_write (GdkPixbufLoader *loader, const guchar *buf, gsize count, GError **error); | |
42 GError* err = null; | |
43 | |
44 - auto p = gdk_pixbuf_loader_write(gdkPixbufLoader, buf.ptr, buf.length, &err); | |
45 + auto p = gdk_pixbuf_loader_write(gdkPixbufLoader, buf.ptr, cast(gint) buf.length, &err); | |
46 | |
47 if (err !is null) | |
48 { | |
49 Index: src/gdkpixbuf/Pixdata.d | |
50 =================================================================== | |
51 --- src/gdkpixbuf/Pixdata.d (revision 797) | |
52 +++ src/gdkpixbuf/Pixdata.d (working copy) | |
53 @@ -193,7 +193,7 @@ | |
54 // gboolean gdk_pixdata_deserialize (GdkPixdata *pixdata, guint stream_length, const guint8 *stream, GError **error); | |
55 GError* err = null; | |
56 | |
57 - auto p = gdk_pixdata_deserialize(gdkPixdata, stream.length, stream.ptr, &err); | |
58 + auto p = gdk_pixdata_deserialize(gdkPixdata, cast(gint) stream.length, stream.ptr, &err); | |
59 | |
60 if (err !is null) | |
61 { | |
62 Index: src/pango/PgLayout.d | |
63 =================================================================== | |
64 --- src/pango/PgLayout.d (revision 797) | |
65 +++ src/pango/PgLayout.d (working copy) | |
66 @@ -145,7 +145,7 @@ | |
67 public void setText(string text) | |
68 { | |
69 // void pango_layout_set_text (PangoLayout *layout, const char *text, int length); | |
70 - pango_layout_set_text(pangoLayout, Str.toStringz(text), text.length); | |
71 + pango_layout_set_text(pangoLayout, Str.toStringz(text), cast(gint) text.length); | |
72 } | |
73 | |
74 | |
75 Index: src/pango/PgCoverage.d | |
76 =================================================================== | |
77 --- src/pango/PgCoverage.d (revision 797) | |
78 +++ src/pango/PgCoverage.d (working copy) | |
79 @@ -222,7 +222,7 @@ | |
80 public static PgCoverage fromBytes(char[] bytes) | |
81 { | |
82 // PangoCoverage * pango_coverage_from_bytes (guchar *bytes, int n_bytes); | |
83 - auto p = pango_coverage_from_bytes(bytes.ptr, bytes.length); | |
84 + auto p = pango_coverage_from_bytes(bytes.ptr, cast(gint) bytes.length); | |
85 if(p is null) | |
86 { | |
87 return null; | |
88 Index: src/gdk/Device.d | |
89 =================================================================== | |
90 --- src/gdk/Device.d (revision 797) | |
91 +++ src/gdk/Device.d (working copy) | |
92 @@ -296,7 +296,7 @@ | |
93 public static void freeHistory(GdkTimeCoord*[] events) | |
94 { | |
95 // void gdk_device_free_history (GdkTimeCoord **events, gint n_events); | |
96 - gdk_device_free_history(events.ptr, events.length); | |
97 + gdk_device_free_history(events.ptr, cast(gint) events.length); | |
98 } | |
99 | |
100 /** | |
101 Index: src/gdk/RgbCmap.d | |
102 =================================================================== | |
103 --- src/gdk/RgbCmap.d (revision 797) | |
104 +++ src/gdk/RgbCmap.d (working copy) | |
105 @@ -227,7 +227,7 @@ | |
106 public this (uint[] colors) | |
107 { | |
108 // GdkRgbCmap * gdk_rgb_cmap_new (guint32 *colors, gint n_colors); | |
109 - auto p = gdk_rgb_cmap_new(colors.ptr, colors.length); | |
110 + auto p = gdk_rgb_cmap_new(colors.ptr, cast(gint) colors.length); | |
111 if(p is null) | |
112 { | |
113 throw new ConstructionException("null returned by gdk_rgb_cmap_new(colors.ptr, colors.length)"); | |
114 Index: src/gdk/Colormap.d | |
115 =================================================================== | |
116 --- src/gdk/Colormap.d (revision 797) | |
117 +++ src/gdk/Colormap.d (working copy) | |
118 @@ -246,7 +246,7 @@ | |
119 public int allocColors(GdkColor[] colors, int writeable, int bestMatch, int[] success) | |
120 { | |
121 // gint gdk_colormap_alloc_colors (GdkColormap *colormap, GdkColor *colors, gint n_colors, gboolean writeable, gboolean best_match, gboolean *success); | |
122 - return gdk_colormap_alloc_colors(gdkColormap, colors.ptr, colors.length, writeable, bestMatch, success.ptr); | |
123 + return gdk_colormap_alloc_colors(gdkColormap, colors.ptr, cast(gint) colors.length, writeable, bestMatch, success.ptr); | |
124 } | |
125 | |
126 /** | |
127 @@ -276,7 +276,7 @@ | |
128 public void freeColors(GdkColor[] colors) | |
129 { | |
130 // void gdk_colormap_free_colors (GdkColormap *colormap, const GdkColor *colors, gint n_colors); | |
131 - gdk_colormap_free_colors(gdkColormap, colors.ptr, colors.length); | |
132 + gdk_colormap_free_colors(gdkColormap, colors.ptr, cast(gint) colors.length); | |
133 } | |
134 | |
135 /** | |
136 @@ -342,7 +342,7 @@ | |
137 public void colorsStore(GdkColor[] colors) | |
138 { | |
139 // void gdk_colors_store (GdkColormap *colormap, GdkColor *colors, gint ncolors); | |
140 - gdk_colors_store(gdkColormap, colors.ptr, colors.length); | |
141 + gdk_colors_store(gdkColormap, colors.ptr, cast(gint) colors.length); | |
142 } | |
143 | |
144 /** | |
145 @@ -362,7 +362,7 @@ | |
146 public int colorsAlloc(int contiguous, uint[] planes, uint[] pixels) | |
147 { | |
148 // gint gdk_colors_alloc (GdkColormap *colormap, gboolean contiguous, gulong *planes, gint nplanes, gulong *pixels, gint npixels); | |
149 - return gdk_colors_alloc(gdkColormap, contiguous, planes.ptr, planes.length, pixels.ptr, pixels.length); | |
150 + return gdk_colors_alloc(gdkColormap, contiguous, planes.ptr, cast(gint) planes.length, pixels.ptr, cast(gint) pixels.length); | |
151 } | |
152 | |
153 /** | |
154 @@ -377,6 +377,6 @@ | |
155 public void colorsFree(uint[] pixels, uint planes) | |
156 { | |
157 // void gdk_colors_free (GdkColormap *colormap, gulong *pixels, gint npixels, gulong planes); | |
158 - gdk_colors_free(gdkColormap, pixels.ptr, pixels.length, planes); | |
159 + gdk_colors_free(gdkColormap, pixels.ptr, cast(gint) pixels.length, planes); | |
160 } | |
161 } | |
162 Index: src/gdk/Pixbuf.d | |
163 =================================================================== | |
164 --- src/gdk/Pixbuf.d (revision 797) | |
165 +++ src/gdk/Pixbuf.d (working copy) | |
166 @@ -732,7 +732,7 @@ | |
167 // GdkPixbuf* gdk_pixbuf_new_from_inline (gint data_length, const guint8 *data, gboolean copy_pixels, GError **error); | |
168 GError* err = null; | |
169 | |
170 - auto p = gdk_pixbuf_new_from_inline(data.length, data.ptr, copyPixels, &err); | |
171 + auto p = gdk_pixbuf_new_from_inline(cast(gint) data.length, data.ptr, copyPixels, &err); | |
172 | |
173 if (err !is null) | |
174 { | |
175 Index: src/gdk/Display.d | |
176 =================================================================== | |
177 --- src/gdk/Display.d (revision 797) | |
178 +++ src/gdk/Display.d (working copy) | |
179 @@ -674,7 +674,7 @@ | |
180 public void storeClipboard(Window clipboardWindow, uint time, GdkAtom[] targets) | |
181 { | |
182 // void gdk_display_store_clipboard (GdkDisplay *display, GdkWindow *clipboard_window, guint32 time_, const GdkAtom *targets, gint n_targets); | |
183 - gdk_display_store_clipboard(gdkDisplay, (clipboardWindow is null) ? null : clipboardWindow.getWindowStruct(), time, targets.ptr, targets.length); | |
184 + gdk_display_store_clipboard(gdkDisplay, (clipboardWindow is null) ? null : clipboardWindow.getWindowStruct(), time, targets.ptr, cast(gint) targets.length); | |
185 } | |
186 | |
187 /** | |
188 Index: src/gdk/Font.d | |
189 =================================================================== | |
190 --- src/gdk/Font.d (revision 797) | |
191 +++ src/gdk/Font.d (working copy) | |
192 @@ -517,7 +517,7 @@ | |
193 public void textExtentsWc(GdkWChar[] text, out int lbearing, out int rbearing, out int width, out int ascent, out int descent) | |
194 { | |
195 // void gdk_text_extents_wc (GdkFont *font, const GdkWChar *text, gint text_length, gint *lbearing, gint *rbearing, gint *width, gint *ascent, gint *descent); | |
196 - gdk_text_extents_wc(gdkFont, text.ptr, text.length, &lbearing, &rbearing, &width, &ascent, &descent); | |
197 + gdk_text_extents_wc(gdkFont, text.ptr, cast(gint) text.length, &lbearing, &rbearing, &width, &ascent, &descent); | |
198 } | |
199 | |
200 /** | |
201 @@ -563,7 +563,7 @@ | |
202 public int textWidthWc(GdkWChar[] text) | |
203 { | |
204 // gint gdk_text_width_wc (GdkFont *font, const GdkWChar *text, gint text_length); | |
205 - return gdk_text_width_wc(gdkFont, text.ptr, text.length); | |
206 + return gdk_text_width_wc(gdkFont, text.ptr, cast(gint) text.length); | |
207 } | |
208 | |
209 /** | |
210 Index: src/gdk/Drawable.d | |
211 =================================================================== | |
212 --- src/gdk/Drawable.d (revision 797) | |
213 +++ src/gdk/Drawable.d (working copy) | |
214 @@ -421,7 +421,7 @@ | |
215 public void drawPoints(GC gc, GdkPoint[] points) | |
216 { | |
217 // void gdk_draw_points (GdkDrawable *drawable, GdkGC *gc, const GdkPoint *points, gint n_points); | |
218 - gdk_draw_points(gdkDrawable, (gc is null) ? null : gc.getGCStruct(), points.ptr, points.length); | |
219 + gdk_draw_points(gdkDrawable, (gc is null) ? null : gc.getGCStruct(), points.ptr, cast(gint) points.length); | |
220 } | |
221 | |
222 /** | |
223 @@ -452,7 +452,7 @@ | |
224 public void drawLines(GC gc, GdkPoint[] points) | |
225 { | |
226 // void gdk_draw_lines (GdkDrawable *drawable, GdkGC *gc, const GdkPoint *points, gint n_points); | |
227 - gdk_draw_lines(gdkDrawable, (gc is null) ? null : gc.getGCStruct(), points.ptr, points.length); | |
228 + gdk_draw_lines(gdkDrawable, (gc is null) ? null : gc.getGCStruct(), points.ptr, cast(gint) points.length); | |
229 } | |
230 | |
231 /** | |
232 @@ -498,7 +498,7 @@ | |
233 public void drawSegments(GC gc, GdkSegment[] segs) | |
234 { | |
235 // void gdk_draw_segments (GdkDrawable *drawable, GdkGC *gc, const GdkSegment *segs, gint n_segs); | |
236 - gdk_draw_segments(gdkDrawable, (gc is null) ? null : gc.getGCStruct(), segs.ptr, segs.length); | |
237 + gdk_draw_segments(gdkDrawable, (gc is null) ? null : gc.getGCStruct(), segs.ptr, cast(gint) segs.length); | |
238 } | |
239 | |
240 /** | |
241 @@ -560,7 +560,7 @@ | |
242 public void drawPolygon(GC gc, int filled, GdkPoint[] points) | |
243 { | |
244 // void gdk_draw_polygon (GdkDrawable *drawable, GdkGC *gc, gboolean filled, const GdkPoint *points, gint n_points); | |
245 - gdk_draw_polygon(gdkDrawable, (gc is null) ? null : gc.getGCStruct(), filled, points.ptr, points.length); | |
246 + gdk_draw_polygon(gdkDrawable, (gc is null) ? null : gc.getGCStruct(), filled, points.ptr, cast(gint) points.length); | |
247 } | |
248 | |
249 /** | |
250 @@ -577,7 +577,7 @@ | |
251 public void drawTrapezoids(GC gc, GdkTrapezoid[] trapezoids) | |
252 { | |
253 // void gdk_draw_trapezoids (GdkDrawable *drawable, GdkGC *gc, const GdkTrapezoid *trapezoids, gint n_trapezoids); | |
254 - gdk_draw_trapezoids(gdkDrawable, (gc is null) ? null : gc.getGCStruct(), trapezoids.ptr, trapezoids.length); | |
255 + gdk_draw_trapezoids(gdkDrawable, (gc is null) ? null : gc.getGCStruct(), trapezoids.ptr, cast(gint) trapezoids.length); | |
256 } | |
257 | |
258 /** | |
259 @@ -759,7 +759,7 @@ | |
260 public void drawTextWc(Font font, GC gc, int x, int y, GdkWChar[] text) | |
261 { | |
262 // void gdk_draw_text_wc (GdkDrawable *drawable, GdkFont *font, GdkGC *gc, gint x, gint y, const GdkWChar *text, gint text_length); | |
263 - gdk_draw_text_wc(gdkDrawable, (font is null) ? null : font.getFontStruct(), (gc is null) ? null : gc.getGCStruct(), x, y, text.ptr, text.length); | |
264 + gdk_draw_text_wc(gdkDrawable, (font is null) ? null : font.getFontStruct(), (gc is null) ? null : gc.getGCStruct(), x, y, text.ptr, cast(gint) text.length); | |
265 } | |
266 | |
267 /** | |
268 Index: src/gdk/Region.d | |
269 =================================================================== | |
270 --- src/gdk/Region.d (revision 797) | |
271 +++ src/gdk/Region.d (working copy) | |
272 @@ -141,7 +141,7 @@ | |
273 public static Region polygon(GdkPoint[] points, GdkFillRule fillRule) | |
274 { | |
275 // GdkRegion * gdk_region_polygon (const GdkPoint *points, gint n_points, GdkFillRule fill_rule); | |
276 - auto p = gdk_region_polygon(points.ptr, points.length, fillRule); | |
277 + auto p = gdk_region_polygon(points.ptr, cast(gint) points.length, fillRule); | |
278 if(p is null) | |
279 { | |
280 return null; | |
281 @@ -377,6 +377,6 @@ | |
282 public void spansIntersectForeach(GdkSpan[] spans, int sorted, GdkSpanFunc funct, void* data) | |
283 { | |
284 // void gdk_region_spans_intersect_foreach (GdkRegion *region, const GdkSpan *spans, int n_spans, gboolean sorted, GdkSpanFunc function, gpointer data); | |
285 - gdk_region_spans_intersect_foreach(gdkRegion, spans.ptr, spans.length, sorted, funct, data); | |
286 + gdk_region_spans_intersect_foreach(gdkRegion, spans.ptr, cast(gint) spans.length, sorted, funct, data); | |
287 } | |
288 } | |
289 Index: src/gtk/Selections.d | |
290 =================================================================== | |
291 --- src/gtk/Selections.d (revision 797) | |
292 +++ src/gtk/Selections.d (working copy) | |
293 @@ -155,7 +155,7 @@ | |
294 public static void addTargets(Widget widget, GdkAtom selection, GtkTargetEntry[] targets) | |
295 { | |
296 // void gtk_selection_add_targets (GtkWidget *widget, GdkAtom selection, const GtkTargetEntry *targets, guint ntargets); | |
297 - gtk_selection_add_targets((widget is null) ? null : widget.getWidgetStruct(), selection, targets.ptr, targets.length); | |
298 + gtk_selection_add_targets((widget is null) ? null : widget.getWidgetStruct(), selection, targets.ptr, cast(gint) targets.length); | |
299 } | |
300 | |
301 /** | |
302 @@ -201,7 +201,7 @@ | |
303 public static void dataSet(GtkSelectionData* selectionData, GdkAtom type, int format, char[] data) | |
304 { | |
305 // void gtk_selection_data_set (GtkSelectionData *selection_data, GdkAtom type, gint format, const guchar *data, gint length); | |
306 - gtk_selection_data_set(selectionData, type, format, data.ptr, data.length); | |
307 + gtk_selection_data_set(selectionData, type, format, data.ptr, cast(gint) data.length); | |
308 } | |
309 | |
310 /** | |
311 Index: src/gtk/IconView.d | |
312 =================================================================== | |
313 --- src/gtk/IconView.d (revision 797) | |
314 +++ src/gtk/IconView.d (working copy) | |
315 @@ -1183,7 +1183,7 @@ | |
316 public void enableModelDragSource(GdkModifierType startButtonMask, GtkTargetEntry[] targets, GdkDragAction actions) | |
317 { | |
318 // void gtk_icon_view_enable_model_drag_source (GtkIconView *icon_view, GdkModifierType start_button_mask, const GtkTargetEntry *targets, gint n_targets, GdkDragAction actions); | |
319 - gtk_icon_view_enable_model_drag_source(gtkIconView, startButtonMask, targets.ptr, targets.length, actions); | |
320 + gtk_icon_view_enable_model_drag_source(gtkIconView, startButtonMask, targets.ptr, cast(gint) targets.length, actions); | |
321 } | |
322 | |
323 /** | |
324 @@ -1198,7 +1198,7 @@ | |
325 public void enableModelDragDest(GtkTargetEntry[] targets, GdkDragAction actions) | |
326 { | |
327 // void gtk_icon_view_enable_model_drag_dest (GtkIconView *icon_view, const GtkTargetEntry *targets, gint n_targets, GdkDragAction actions); | |
328 - gtk_icon_view_enable_model_drag_dest(gtkIconView, targets.ptr, targets.length, actions); | |
329 + gtk_icon_view_enable_model_drag_dest(gtkIconView, targets.ptr, cast(gint) targets.length, actions); | |
330 } | |
331 | |
332 /** | |
333 Index: src/gtk/IMContextSimple.d | |
334 =================================================================== | |
335 --- src/gtk/IMContextSimple.d (revision 797) | |
336 +++ src/gtk/IMContextSimple.d (working copy) | |
337 @@ -143,6 +143,6 @@ | |
338 public void addTable(ushort[] data, int maxSeqLen) | |
339 { | |
340 // void gtk_im_context_simple_add_table (GtkIMContextSimple *context_simple, guint16 *data, gint max_seq_len, gint n_seqs); | |
341 - gtk_im_context_simple_add_table(gtkIMContextSimple, data.ptr, maxSeqLen, data.length); | |
342 + gtk_im_context_simple_add_table(gtkIMContextSimple, data.ptr, maxSeqLen, cast(gint) data.length); | |
343 } | |
344 } | |
345 Index: src/gtk/Clipboard.d | |
346 =================================================================== | |
347 --- src/gtk/Clipboard.d (revision 797) | |
348 +++ src/gtk/Clipboard.d (working copy) | |
349 @@ -307,7 +307,7 @@ | |
350 public int setWithData(GtkTargetEntry[] targets, GtkClipboardGetFunc getFunc, GtkClipboardClearFunc clearFunc, void* userData) | |
351 { | |
352 // gboolean gtk_clipboard_set_with_data (GtkClipboard *clipboard, const GtkTargetEntry *targets, guint n_targets, GtkClipboardGetFunc get_func, GtkClipboardClearFunc clear_func, gpointer user_data); | |
353 - return gtk_clipboard_set_with_data(gtkClipboard, targets.ptr, targets.length, getFunc, clearFunc, userData); | |
354 + return gtk_clipboard_set_with_data(gtkClipboard, targets.ptr, cast(gint) targets.length, getFunc, clearFunc, userData); | |
355 } | |
356 | |
357 /** | |
358 @@ -330,7 +330,7 @@ | |
359 public int setWithOwner(GtkTargetEntry[] targets, GtkClipboardGetFunc getFunc, GtkClipboardClearFunc clearFunc, ObjectG owner) | |
360 { | |
361 // gboolean gtk_clipboard_set_with_owner (GtkClipboard *clipboard, const GtkTargetEntry *targets, guint n_targets, GtkClipboardGetFunc get_func, GtkClipboardClearFunc clear_func, GObject *owner); | |
362 - return gtk_clipboard_set_with_owner(gtkClipboard, targets.ptr, targets.length, getFunc, clearFunc, (owner is null) ? null : owner.getObjectGStruct()); | |
363 + return gtk_clipboard_set_with_owner(gtkClipboard, targets.ptr, cast(gint) targets.length, getFunc, clearFunc, (owner is null) ? null : owner.getObjectGStruct()); | |
364 } | |
365 | |
366 /** | |
367 @@ -722,7 +722,7 @@ | |
368 public void setCanStore(GtkTargetEntry[] targets) | |
369 { | |
370 // void gtk_clipboard_set_can_store (GtkClipboard *clipboard, const GtkTargetEntry *targets, gint n_targets); | |
371 - gtk_clipboard_set_can_store(gtkClipboard, targets.ptr, targets.length); | |
372 + gtk_clipboard_set_can_store(gtkClipboard, targets.ptr, cast(gint) targets.length); | |
373 } | |
374 | |
375 /** | |
376 Index: src/gtk/EntryBuffer.d | |
377 =================================================================== | |
378 --- src/gtk/EntryBuffer.d (revision 797) | |
379 +++ src/gtk/EntryBuffer.d (working copy) | |
380 @@ -185,7 +185,7 @@ | |
381 public this (char[] initialChars) | |
382 { | |
383 // GtkEntryBuffer* gtk_entry_buffer_new (const gchar *initial_chars, gint n_initial_chars); | |
384 - auto p = gtk_entry_buffer_new(initialChars.ptr, initialChars.length); | |
385 + auto p = gtk_entry_buffer_new(initialChars.ptr, cast(gint) initialChars.length); | |
386 if(p is null) | |
387 { | |
388 throw new ConstructionException("null returned by gtk_entry_buffer_new(initialChars.ptr, initialChars.length)"); | |
389 @@ -218,7 +218,7 @@ | |
390 public void setText(char[] chars) | |
391 { | |
392 // void gtk_entry_buffer_set_text (GtkEntryBuffer *buffer, const gchar *chars, gint n_chars); | |
393 - gtk_entry_buffer_set_text(gtkEntryBuffer, chars.ptr, chars.length); | |
394 + gtk_entry_buffer_set_text(gtkEntryBuffer, chars.ptr, cast(gint) chars.length); | |
395 } | |
396 | |
397 /** | |
398 @@ -289,7 +289,7 @@ | |
399 public uint insertText(uint position, char[] chars) | |
400 { | |
401 // guint gtk_entry_buffer_insert_text (GtkEntryBuffer *buffer, guint position, const gchar *chars, gint n_chars); | |
402 - return gtk_entry_buffer_insert_text(gtkEntryBuffer, position, chars.ptr, chars.length); | |
403 + return gtk_entry_buffer_insert_text(gtkEntryBuffer, position, chars.ptr, cast(gint) chars.length); | |
404 } | |
405 | |
406 /** | |
407 @@ -334,6 +334,6 @@ | |
408 public void emitInsertedText(uint position, char[] chars) | |
409 { | |
410 // void gtk_entry_buffer_emit_inserted_text (GtkEntryBuffer *buffer, guint position, const gchar *chars, guint n_chars); | |
411 - gtk_entry_buffer_emit_inserted_text(gtkEntryBuffer, position, chars.ptr, chars.length); | |
412 + gtk_entry_buffer_emit_inserted_text(gtkEntryBuffer, position, chars.ptr, cast(gint) chars.length); | |
413 } | |
414 } | |
415 Index: src/gtk/Style.d | |
416 =================================================================== | |
417 --- src/gtk/Style.d (revision 797) | |
418 +++ src/gtk/Style.d (working copy) | |
419 @@ -529,7 +529,7 @@ | |
420 public void drawPolygon(Window window, GtkStateType stateType, GtkShadowType shadowType, GdkPoint[] points, int fill) | |
421 { | |
422 // void gtk_draw_polygon (GtkStyle *style, GdkWindow *window, GtkStateType state_type, GtkShadowType shadow_type, GdkPoint *points, gint npoints, gboolean fill); | |
423 - gtk_draw_polygon(gtkStyle, (window is null) ? null : window.getWindowStruct(), stateType, shadowType, points.ptr, points.length, fill); | |
424 + gtk_draw_polygon(gtkStyle, (window is null) ? null : window.getWindowStruct(), stateType, shadowType, points.ptr, cast(gint) points.length, fill); | |
425 } | |
426 | |
427 /** | |
428 Index: src/gtk/TreeModelFilter.d | |
429 =================================================================== | |
430 --- src/gtk/TreeModelFilter.d (revision 797) | |
431 +++ src/gtk/TreeModelFilter.d (working copy) | |
432 @@ -237,7 +237,7 @@ | |
433 public void setModifyFunc(GType[] types, GtkTreeModelFilterModifyFunc func, void* data, GDestroyNotify destroy) | |
434 { | |
435 // void gtk_tree_model_filter_set_modify_func (GtkTreeModelFilter *filter, gint n_columns, GType *types, GtkTreeModelFilterModifyFunc func, gpointer data, GDestroyNotify destroy); | |
436 - gtk_tree_model_filter_set_modify_func(gtkTreeModelFilter, types.length, types.ptr, func, data, destroy); | |
437 + gtk_tree_model_filter_set_modify_func(gtkTreeModelFilter, cast(gint) types.length, types.ptr, func, data, destroy); | |
438 } | |
439 | |
440 /** | |
441 Index: src/gtk/PrintSettings.d | |
442 =================================================================== | |
443 --- src/gtk/PrintSettings.d (revision 797) | |
444 +++ src/gtk/PrintSettings.d (working copy) | |
445 @@ -841,7 +841,7 @@ | |
446 public void setPageRanges(GtkPageRange[] pageRanges) | |
447 { | |
448 // void gtk_print_settings_set_page_ranges (GtkPrintSettings *settings, GtkPageRange *page_ranges, gint num_ranges); | |
449 - gtk_print_settings_set_page_ranges(gtkPrintSettings, pageRanges.ptr, pageRanges.length); | |
450 + gtk_print_settings_set_page_ranges(gtkPrintSettings, pageRanges.ptr, cast(gint) pageRanges.length); | |
451 } | |
452 | |
453 /** | |
454 Index: src/gtk/ActionGroup.d | |
455 =================================================================== | |
456 --- src/gtk/ActionGroup.d (revision 797) | |
457 +++ src/gtk/ActionGroup.d (working copy) | |
458 @@ -487,7 +487,7 @@ | |
459 public void addActions(GtkActionEntry[] entries, void* userData) | |
460 { | |
461 // void gtk_action_group_add_actions (GtkActionGroup *action_group, const GtkActionEntry *entries, guint n_entries, gpointer user_data); | |
462 - gtk_action_group_add_actions(gtkActionGroup, entries.ptr, entries.length, userData); | |
463 + gtk_action_group_add_actions(gtkActionGroup, entries.ptr, cast(gint) entries.length, userData); | |
464 } | |
465 | |
466 /** | |
467 @@ -502,7 +502,7 @@ | |
468 public void addActionsFull(GtkActionEntry[] entries, void* userData, GDestroyNotify destroy) | |
469 { | |
470 // void gtk_action_group_add_actions_full (GtkActionGroup *action_group, const GtkActionEntry *entries, guint n_entries, gpointer user_data, GDestroyNotify destroy); | |
471 - gtk_action_group_add_actions_full(gtkActionGroup, entries.ptr, entries.length, userData, destroy); | |
472 + gtk_action_group_add_actions_full(gtkActionGroup, entries.ptr, cast(gint) entries.length, userData, destroy); | |
473 } | |
474 | |
475 /** | |
476 @@ -519,7 +519,7 @@ | |
477 public void addToggleActions(GtkToggleActionEntry[] entries, void* userData) | |
478 { | |
479 // void gtk_action_group_add_toggle_actions (GtkActionGroup *action_group, const GtkToggleActionEntry *entries, guint n_entries, gpointer user_data); | |
480 - gtk_action_group_add_toggle_actions(gtkActionGroup, entries.ptr, entries.length, userData); | |
481 + gtk_action_group_add_toggle_actions(gtkActionGroup, entries.ptr, cast(gint) entries.length, userData); | |
482 } | |
483 | |
484 /** | |
485 @@ -534,7 +534,7 @@ | |
486 public void addToggleActionsFull(GtkToggleActionEntry[] entries, void* userData, GDestroyNotify destroy) | |
487 { | |
488 // void gtk_action_group_add_toggle_actions_full (GtkActionGroup *action_group, const GtkToggleActionEntry *entries, guint n_entries, gpointer user_data, GDestroyNotify destroy); | |
489 - gtk_action_group_add_toggle_actions_full(gtkActionGroup, entries.ptr, entries.length, userData, destroy); | |
490 + gtk_action_group_add_toggle_actions_full(gtkActionGroup, entries.ptr, cast(gint) entries.length, userData, destroy); | |
491 } | |
492 | |
493 /** | |
494 @@ -554,7 +554,7 @@ | |
495 public void addRadioActions(GtkRadioActionEntry[] entries, int value, GCallback onChange, void* userData) | |
496 { | |
497 // void gtk_action_group_add_radio_actions (GtkActionGroup *action_group, const GtkRadioActionEntry *entries, guint n_entries, gint value, GCallback on_change, gpointer user_data); | |
498 - gtk_action_group_add_radio_actions(gtkActionGroup, entries.ptr, entries.length, value, onChange, userData); | |
499 + gtk_action_group_add_radio_actions(gtkActionGroup, entries.ptr, cast(gint) entries.length, value, onChange, userData); | |
500 } | |
501 | |
502 /** | |
503 @@ -572,7 +572,7 @@ | |
504 public void addRadioActionsFull(GtkRadioActionEntry[] entries, int value, GCallback onChange, void* userData, GDestroyNotify destroy) | |
505 { | |
506 // void gtk_action_group_add_radio_actions_full (GtkActionGroup *action_group, const GtkRadioActionEntry *entries, guint n_entries, gint value, GCallback on_change, gpointer user_data, GDestroyNotify destroy); | |
507 - gtk_action_group_add_radio_actions_full(gtkActionGroup, entries.ptr, entries.length, value, onChange, userData, destroy); | |
508 + gtk_action_group_add_radio_actions_full(gtkActionGroup, entries.ptr, cast(gint) entries.length, value, onChange, userData, destroy); | |
509 } | |
510 | |
511 /** | |
512 Index: src/gtk/TextBuffer.d | |
513 =================================================================== | |
514 --- src/gtk/TextBuffer.d (revision 797) | |
515 +++ src/gtk/TextBuffer.d (working copy) | |
516 @@ -180,7 +180,7 @@ | |
517 public void setText(string text) | |
518 { | |
519 // void gtk_text_buffer_set_text (GtkTextBuffer *buffer, const gchar *text, gint len); | |
520 - gtk_text_buffer_set_text(gtkTextBuffer, Str.toStringz(text), text.length); | |
521 + gtk_text_buffer_set_text(gtkTextBuffer, Str.toStringz(text), cast(gint) text.length); | |
522 } | |
523 | |
524 /** | |
525 @@ -198,7 +198,7 @@ | |
526 public void insert(TextIter iter, string text) | |
527 { | |
528 // void gtk_text_buffer_insert (GtkTextBuffer *buffer, GtkTextIter *iter, const gchar *text, gint len); | |
529 - gtk_text_buffer_insert(gtkTextBuffer, (iter is null) ? null : iter.getTextIterStruct(), Str.toStringz(text), text.length); | |
530 + gtk_text_buffer_insert(gtkTextBuffer, (iter is null) ? null : iter.getTextIterStruct(), Str.toStringz(text), cast(gint) text.length); | |
531 } | |
532 | |
533 /** | |
534 @@ -210,7 +210,7 @@ | |
535 public void insertAtCursor(string text) | |
536 { | |
537 // void gtk_text_buffer_insert_at_cursor (GtkTextBuffer *buffer, const gchar *text, gint len); | |
538 - gtk_text_buffer_insert_at_cursor(gtkTextBuffer, Str.toStringz(text), text.length); | |
539 + gtk_text_buffer_insert_at_cursor(gtkTextBuffer, Str.toStringz(text), cast(gint) text.length); | |
540 } | |
541 | |
542 /** | |
543 @@ -231,7 +231,7 @@ | |
544 public int insertInteractive(TextIter iter, string text, int defaultEditable) | |
545 { | |
546 // gboolean gtk_text_buffer_insert_interactive (GtkTextBuffer *buffer, GtkTextIter *iter, const gchar *text, gint len, gboolean default_editable); | |
547 - return gtk_text_buffer_insert_interactive(gtkTextBuffer, (iter is null) ? null : iter.getTextIterStruct(), Str.toStringz(text), text.length, defaultEditable); | |
548 + return gtk_text_buffer_insert_interactive(gtkTextBuffer, (iter is null) ? null : iter.getTextIterStruct(), Str.toStringz(text), cast(gint) text.length, defaultEditable); | |
549 } | |
550 | |
551 /** | |
552 @@ -249,7 +249,7 @@ | |
553 public int insertInteractiveAtCursor(string text, int defaultEditable) | |
554 { | |
555 // gboolean gtk_text_buffer_insert_interactive_at_cursor (GtkTextBuffer *buffer, const gchar *text, gint len, gboolean default_editable); | |
556 - return gtk_text_buffer_insert_interactive_at_cursor(gtkTextBuffer, Str.toStringz(text), text.length, defaultEditable); | |
557 + return gtk_text_buffer_insert_interactive_at_cursor(gtkTextBuffer, Str.toStringz(text), cast(gint) text.length, defaultEditable); | |
558 } | |
559 | |
560 /** | |
561 @@ -270,7 +270,7 @@ | |
562 { | |
563 TextTag tag = va_arg!(TextTag)(_argptr); | |
564 // void gtk_text_buffer_insert_with_tags (GtkTextBuffer *buffer, GtkTextIter *iter, const gchar *text, gint len, GtkTextTag *first_tag, ...); | |
565 - gtk_text_buffer_insert_with_tags(gtkTextBuffer, (iter is null) ? null : iter.getTextIterStruct(), Str.toStringz(text), text.length, (tag is null) ? null : tag.getTextTagStruct(), null); | |
566 + gtk_text_buffer_insert_with_tags(gtkTextBuffer, (iter is null) ? null : iter.getTextIterStruct(), Str.toStringz(text), cast(gint) text.length, (tag is null) ? null : tag.getTextTagStruct(), null); | |
567 } | |
568 } | |
569 | |
570 @@ -289,7 +289,7 @@ | |
571 { | |
572 string tagName = va_arg!(string)(_argptr); | |
573 // void gtk_text_buffer_insert_with_tags_by_name (GtkTextBuffer *buffer, GtkTextIter *iter, const gchar *text, gint len, const gchar *first_tag_name, ...); | |
574 - gtk_text_buffer_insert_with_tags_by_name(gtkTextBuffer, (iter is null) ? null : iter.getTextIterStruct(), Str.toStringz(text), text.length, Str.toStringz(tagName), null); | |
575 + gtk_text_buffer_insert_with_tags_by_name(gtkTextBuffer, (iter is null) ? null : iter.getTextIterStruct(), Str.toStringz(text), cast(gint) text.length, Str.toStringz(tagName), null); | |
576 } | |
577 } | |
578 | |
579 @@ -1785,7 +1785,7 @@ | |
580 // gboolean gtk_text_buffer_deserialize (GtkTextBuffer *register_buffer, GtkTextBuffer *content_buffer, GdkAtom format, GtkTextIter *iter, const guint8 *data, gsize length, GError **error); | |
581 GError* err = null; | |
582 | |
583 - auto p = gtk_text_buffer_deserialize(gtkTextBuffer, (contentBuffer is null) ? null : contentBuffer.getTextBufferStruct(), format, (iter is null) ? null : iter.getTextIterStruct(), data.ptr, data.length, &err); | |
584 + auto p = gtk_text_buffer_deserialize(gtkTextBuffer, (contentBuffer is null) ? null : contentBuffer.getTextBufferStruct(), format, (iter is null) ? null : iter.getTextIterStruct(), data.ptr, cast(gint) data.length, &err); | |
585 | |
586 if (err !is null) | |
587 { | |
588 Index: src/gtk/Signals.d | |
589 =================================================================== | |
590 --- src/gtk/Signals.d (revision 797) | |
591 +++ src/gtk/Signals.d (working copy) | |
592 @@ -184,7 +184,7 @@ | |
593 public static uint newv(string name, GtkSignalRunType signalFlags, GType objectType, uint functionOffset, GSignalCMarshaller marshaller, GType returnVal, GType[] args) | |
594 { | |
595 // guint gtk_signal_newv (const gchar *name, GtkSignalRunType signal_flags, GType object_type, guint function_offset, GSignalCMarshaller marshaller, GType return_val, guint n_args, GType *args); | |
596 - return gtk_signal_newv(Str.toStringz(name), signalFlags, objectType, functionOffset, marshaller, returnVal, args.length, args.ptr); | |
597 + return gtk_signal_newv(Str.toStringz(name), signalFlags, objectType, functionOffset, marshaller, returnVal, cast(gint) args.length, args.ptr); | |
598 } | |
599 | |
600 /** | |
601 Index: src/gtk/TreeStore.d | |
602 =================================================================== | |
603 --- src/gtk/TreeStore.d (revision 797) | |
604 +++ src/gtk/TreeStore.d (working copy) | |
605 @@ -336,7 +336,7 @@ | |
606 public this (GType[] types) | |
607 { | |
608 // GtkTreeStore * gtk_tree_store_newv (gint n_columns, GType *types); | |
609 - auto p = gtk_tree_store_newv(types.length, types.ptr); | |
610 + auto p = gtk_tree_store_newv(cast(gint) types.length, types.ptr); | |
611 if(p is null) | |
612 { | |
613 throw new ConstructionException("null returned by gtk_tree_store_newv(types.length, types.ptr)"); | |
614 @@ -355,7 +355,7 @@ | |
615 public void setColumnTypes(GType[] types) | |
616 { | |
617 // void gtk_tree_store_set_column_types (GtkTreeStore *tree_store, gint n_columns, GType *types); | |
618 - gtk_tree_store_set_column_types(gtkTreeStore, types.length, types.ptr); | |
619 + gtk_tree_store_set_column_types(gtkTreeStore, cast(gint) types.length, types.ptr); | |
620 } | |
621 | |
622 /** | |
623 @@ -400,7 +400,7 @@ | |
624 public void setValuesv(TreeIter iter, int[] columns, GValue[] values) | |
625 { | |
626 // void gtk_tree_store_set_valuesv (GtkTreeStore *tree_store, GtkTreeIter *iter, gint *columns, GValue *values, gint n_values); | |
627 - gtk_tree_store_set_valuesv(gtkTreeStore, (iter is null) ? null : iter.getTreeIterStruct(), columns.ptr, values.ptr, values.length); | |
628 + gtk_tree_store_set_valuesv(gtkTreeStore, (iter is null) ? null : iter.getTreeIterStruct(), columns.ptr, values.ptr, cast(gint) values.length); | |
629 } | |
630 | |
631 /** | |
632 @@ -491,7 +491,7 @@ | |
633 public void insertWithValuesv(TreeIter iter, TreeIter parent, int position, int[] columns, GValue[] values) | |
634 { | |
635 // void gtk_tree_store_insert_with_valuesv (GtkTreeStore *tree_store, GtkTreeIter *iter, GtkTreeIter *parent, gint position, gint *columns, GValue *values, gint n_values); | |
636 - gtk_tree_store_insert_with_valuesv(gtkTreeStore, (iter is null) ? null : iter.getTreeIterStruct(), (parent is null) ? null : parent.getTreeIterStruct(), position, columns.ptr, values.ptr, values.length); | |
637 + gtk_tree_store_insert_with_valuesv(gtkTreeStore, (iter is null) ? null : iter.getTreeIterStruct(), (parent is null) ? null : parent.getTreeIterStruct(), position, columns.ptr, values.ptr, cast(gint) values.length); | |
638 } | |
639 | |
640 /** | |
641 Index: src/gtk/Testing.d | |
642 =================================================================== | |
643 --- src/gtk/Testing.d (revision 797) | |
644 +++ src/gtk/Testing.d (working copy) | |
645 @@ -88,7 +88,7 @@ | |
646 { | |
647 // gboolean gtk_parse_args (int *argc, char ***argv); | |
648 char** outargv = Str.toStringzArray(argv); | |
649 - int argc = argv.length; | |
650 + int argc = cast(gint) argv.length; | |
651 | |
652 gtk_test_init(&argc, &outargv, null); | |
653 | |
654 Index: src/gtk/TargetList.d | |
655 =================================================================== | |
656 --- src/gtk/TargetList.d (revision 797) | |
657 +++ src/gtk/TargetList.d (working copy) | |
658 @@ -124,7 +124,7 @@ | |
659 public this (GtkTargetEntry[] targets) | |
660 { | |
661 // GtkTargetList * gtk_target_list_new (const GtkTargetEntry *targets, guint ntargets); | |
662 - auto p = gtk_target_list_new(targets.ptr, targets.length); | |
663 + auto p = gtk_target_list_new(targets.ptr, cast(gint) targets.length); | |
664 if(p is null) | |
665 { | |
666 throw new ConstructionException("null returned by gtk_target_list_new(targets.ptr, targets.length)"); | |
667 @@ -178,7 +178,7 @@ | |
668 public void addTable(GtkTargetEntry[] targets) | |
669 { | |
670 // void gtk_target_list_add_table (GtkTargetList *list, const GtkTargetEntry *targets, guint ntargets); | |
671 - gtk_target_list_add_table(gtkTargetList, targets.ptr, targets.length); | |
672 + gtk_target_list_add_table(gtkTargetList, targets.ptr, cast(gint) targets.length); | |
673 } | |
674 | |
675 /** | |
676 @@ -308,7 +308,7 @@ | |
677 public static int gtkTargetsIncludeImage(GdkAtom[] targets, int writable) | |
678 { | |
679 // gboolean gtk_targets_include_image (GdkAtom *targets, gint n_targets, gboolean writable); | |
680 - return gtk_targets_include_image(targets.ptr, targets.length, writable); | |
681 + return gtk_targets_include_image(targets.ptr, cast(gint) targets.length, writable); | |
682 } | |
683 | |
684 /** | |
685 @@ -322,7 +322,7 @@ | |
686 public static int gtkTargetsIncludeText(GdkAtom[] targets) | |
687 { | |
688 // gboolean gtk_targets_include_text (GdkAtom *targets, gint n_targets); | |
689 - return gtk_targets_include_text(targets.ptr, targets.length); | |
690 + return gtk_targets_include_text(targets.ptr, cast(gint) targets.length); | |
691 } | |
692 | |
693 /** | |
694 @@ -336,7 +336,7 @@ | |
695 public static int gtkTargetsIncludeUri(GdkAtom[] targets) | |
696 { | |
697 // gboolean gtk_targets_include_uri (GdkAtom *targets, gint n_targets); | |
698 - return gtk_targets_include_uri(targets.ptr, targets.length); | |
699 + return gtk_targets_include_uri(targets.ptr, cast(gint) targets.length); | |
700 } | |
701 | |
702 /** | |
703 @@ -351,6 +351,6 @@ | |
704 public static int gtkTargetsIncludeRichText(GdkAtom[] targets, TextBuffer buffer) | |
705 { | |
706 // gboolean gtk_targets_include_rich_text (GdkAtom *targets, gint n_targets, GtkTextBuffer *buffer); | |
707 - return gtk_targets_include_rich_text(targets.ptr, targets.length, (buffer is null) ? null : buffer.getTextBufferStruct()); | |
708 + return gtk_targets_include_rich_text(targets.ptr, cast(gint) targets.length, (buffer is null) ? null : buffer.getTextBufferStruct()); | |
709 } | |
710 } | |
711 Index: src/gtk/ListStore.d | |
712 =================================================================== | |
713 --- src/gtk/ListStore.d (revision 797) | |
714 +++ src/gtk/ListStore.d (working copy) | |
715 @@ -405,7 +405,7 @@ | |
716 public this (GType[] types) | |
717 { | |
718 // GtkListStore * gtk_list_store_newv (gint n_columns, GType *types); | |
719 - auto p = gtk_list_store_newv(types.length, types.ptr); | |
720 + auto p = gtk_list_store_newv(cast(gint) types.length, types.ptr); | |
721 if(p is null) | |
722 { | |
723 throw new ConstructionException("null returned by gtk_list_store_newv(types.length, types.ptr)"); | |
724 @@ -424,7 +424,7 @@ | |
725 public void setColumnTypes(GType[] types) | |
726 { | |
727 // void gtk_list_store_set_column_types (GtkListStore *list_store, gint n_columns, GType *types); | |
728 - gtk_list_store_set_column_types(gtkListStore, types.length, types.ptr); | |
729 + gtk_list_store_set_column_types(gtkListStore, cast(gint) types.length, types.ptr); | |
730 } | |
731 | |
732 /** | |
733 @@ -470,7 +470,7 @@ | |
734 public void setValuesv(TreeIter iter, int[] columns, GValue[] values) | |
735 { | |
736 // void gtk_list_store_set_valuesv (GtkListStore *list_store, GtkTreeIter *iter, gint *columns, GValue *values, gint n_values); | |
737 - gtk_list_store_set_valuesv(gtkListStore, (iter is null) ? null : iter.getTreeIterStruct(), columns.ptr, values.ptr, values.length); | |
738 + gtk_list_store_set_valuesv(gtkListStore, (iter is null) ? null : iter.getTreeIterStruct(), columns.ptr, values.ptr, cast(gint) values.length); | |
739 } | |
740 | |
741 /** | |
742 @@ -548,7 +548,7 @@ | |
743 public void insertWithValuesv(TreeIter iter, int position, int[] columns, GValue[] values) | |
744 { | |
745 // void gtk_list_store_insert_with_valuesv (GtkListStore *list_store, GtkTreeIter *iter, gint position, gint *columns, GValue *values, gint n_values); | |
746 - gtk_list_store_insert_with_valuesv(gtkListStore, (iter is null) ? null : iter.getTreeIterStruct(), position, columns.ptr, values.ptr, values.length); | |
747 + gtk_list_store_insert_with_valuesv(gtkListStore, (iter is null) ? null : iter.getTreeIterStruct(), position, columns.ptr, values.ptr, cast(gint) values.length); | |
748 } | |
749 | |
750 /** | |
751 Index: src/gtk/Dialog.d | |
752 =================================================================== | |
753 --- src/gtk/Dialog.d (revision 797) | |
754 +++ src/gtk/Dialog.d (working copy) | |
755 @@ -596,6 +596,6 @@ | |
756 public void setAlternativeButtonOrderFromArray(int[] newOrder) | |
757 { | |
758 // void gtk_dialog_set_alternative_button_order_from_array (GtkDialog *dialog, gint n_params, gint *new_order); | |
759 - gtk_dialog_set_alternative_button_order_from_array(gtkDialog, newOrder.length, newOrder.ptr); | |
760 + gtk_dialog_set_alternative_button_order_from_array(gtkDialog, cast(gint) newOrder.length, newOrder.ptr); | |
761 } | |
762 } | |
763 Index: src/gtk/TreeView.d | |
764 =================================================================== | |
765 --- src/gtk/TreeView.d (revision 797) | |
766 +++ src/gtk/TreeView.d (working copy) | |
767 @@ -1731,7 +1731,7 @@ | |
768 public void enableModelDragDest(GtkTargetEntry[] targets, GdkDragAction actions) | |
769 { | |
770 // void gtk_tree_view_enable_model_drag_dest (GtkTreeView *tree_view, const GtkTargetEntry *targets, gint n_targets, GdkDragAction actions); | |
771 - gtk_tree_view_enable_model_drag_dest(gtkTreeView, targets.ptr, targets.length, actions); | |
772 + gtk_tree_view_enable_model_drag_dest(gtkTreeView, targets.ptr, cast(gint) targets.length, actions); | |
773 } | |
774 | |
775 /** | |
776 @@ -1746,7 +1746,7 @@ | |
777 public void enableModelDragSource(GdkModifierType startButtonMask, GtkTargetEntry[] targets, GdkDragAction actions) | |
778 { | |
779 // void gtk_tree_view_enable_model_drag_source (GtkTreeView *tree_view, GdkModifierType start_button_mask, const GtkTargetEntry *targets, gint n_targets, GdkDragAction actions); | |
780 - gtk_tree_view_enable_model_drag_source(gtkTreeView, startButtonMask, targets.ptr, targets.length, actions); | |
781 + gtk_tree_view_enable_model_drag_source(gtkTreeView, startButtonMask, targets.ptr, cast(gint) targets.length, actions); | |
782 } | |
783 | |
784 /** | |
785 Index: src/cairo/Context.d | |
786 =================================================================== | |
787 --- src/cairo/Context.d (revision 797) | |
788 +++ src/cairo/Context.d (working copy) | |
789 @@ -679,7 +679,7 @@ | |
790 public void setDash(double[] dashes, double offset) | |
791 { | |
792 // void cairo_set_dash (cairo_t *cr, const double *dashes, int num_dashes, double offset); | |
793 - cairo_set_dash(cairo, dashes.ptr, dashes.length, offset); | |
794 + cairo_set_dash(cairo, dashes.ptr, cast(gint) dashes.length, offset); | |
795 } | |
796 | |
797 /** | |
798 @@ -2087,7 +2087,7 @@ | |
799 public void showGlyphs(cairo_glyph_t[] glyphs) | |
800 { | |
801 // void cairo_show_glyphs (cairo_t *cr, const cairo_glyph_t *glyphs, int num_glyphs); | |
802 - cairo_show_glyphs(cairo, glyphs.ptr, glyphs.length); | |
803 + cairo_show_glyphs(cairo, glyphs.ptr, cast(gint) glyphs.length); | |
804 } | |
805 | |
806 /** | |
807 @@ -2119,7 +2119,7 @@ | |
808 public void showTextGlyphs(string utf8, int utf8_Len, cairo_glyph_t[] glyphs, cairo_text_cluster_t[] clusters, cairo_text_cluster_flags_t clusterFlags) | |
809 { | |
810 // void cairo_show_text_glyphs (cairo_t *cr, const char *utf8, int utf8_len, const cairo_glyph_t *glyphs, int num_glyphs, const cairo_text_cluster_t *clusters, int num_clusters, cairo_text_cluster_flags_t cluster_flags); | |
811 - cairo_show_text_glyphs(cairo, Str.toStringz(utf8), utf8_Len, glyphs.ptr, glyphs.length, clusters.ptr, clusters.length, clusterFlags); | |
812 + cairo_show_text_glyphs(cairo, Str.toStringz(utf8), utf8_Len, glyphs.ptr, cast(gint) glyphs.length, clusters.ptr, cast(gint) clusters.length, clusterFlags); | |
813 } | |
814 | |
815 /** | |
816 @@ -2174,7 +2174,7 @@ | |
817 public void glyphExtents(cairo_glyph_t[] glyphs, cairo_text_extents_t* extents) | |
818 { | |
819 // void cairo_glyph_extents (cairo_t *cr, const cairo_glyph_t *glyphs, int num_glyphs, cairo_text_extents_t *extents); | |
820 - cairo_glyph_extents(cairo, glyphs.ptr, glyphs.length, extents); | |
821 + cairo_glyph_extents(cairo, glyphs.ptr, cast(gint) glyphs.length, extents); | |
822 } | |
823 | |
824 /** | |
825 Index: src/glib/ByteArray.d | |
826 =================================================================== | |
827 --- src/glib/ByteArray.d (revision 797) | |
828 +++ src/glib/ByteArray.d (working copy) | |
829 @@ -195,7 +195,7 @@ | |
830 public ByteArray append(ubyte[] data) | |
831 { | |
832 // GByteArray* g_byte_array_append (GByteArray *array, const guint8 *data, guint len); | |
833 - auto p = g_byte_array_append(gByteArray, data.ptr, data.length); | |
834 + auto p = g_byte_array_append(gByteArray, data.ptr, cast(gint) data.length); | |
835 if(p is null) | |
836 { | |
837 return null; | |
838 @@ -213,7 +213,7 @@ | |
839 public ByteArray prepend(ubyte[] data) | |
840 { | |
841 // GByteArray* g_byte_array_prepend (GByteArray *array, const guint8 *data, guint len); | |
842 - auto p = g_byte_array_prepend(gByteArray, data.ptr, data.length); | |
843 + auto p = g_byte_array_prepend(gByteArray, data.ptr, cast(gint) data.length); | |
844 if(p is null) | |
845 { | |
846 return null; | |
847 Index: src/glib/MainLoop.d | |
848 =================================================================== | |
849 --- src/glib/MainLoop.d (revision 797) | |
850 +++ src/glib/MainLoop.d (working copy) | |
851 @@ -324,6 +324,6 @@ | |
852 public static int poll(GPollFD[] fds, int timeout) | |
853 { | |
854 // gint g_poll (GPollFD *fds, guint nfds, gint timeout); | |
855 - return g_poll(fds.ptr, fds.length, timeout); | |
856 + return g_poll(fds.ptr, cast(gint) fds.length, timeout); | |
857 } | |
858 } | |
859 Index: src/glib/Spawn.d | |
860 =================================================================== | |
861 --- src/glib/Spawn.d (revision 797) | |
862 +++ src/glib/Spawn.d (working copy) | |
863 @@ -322,7 +322,7 @@ | |
864 { | |
865 return ""; | |
866 } | |
867 - int l = strlen(line.ptr); | |
868 + int l = cast(int) strlen(line.ptr); | |
869 if ( l > 0 ) --l; | |
870 //printf("\nreadLine\n"); | |
871 //foreach ( char c ; line ) | |
872 Index: src/glib/VariantType.d | |
873 =================================================================== | |
874 --- src/glib/VariantType.d (revision 797) | |
875 +++ src/glib/VariantType.d (working copy) | |
876 @@ -624,7 +624,7 @@ | |
877 itemsArray[i] = items[i].getVariantTypeStruct(); | |
878 } | |
879 | |
880 - auto p = g_variant_type_new_tuple(itemsArray.ptr, items.length); | |
881 + auto p = g_variant_type_new_tuple(itemsArray.ptr, cast(gint) items.length); | |
882 if(p is null) | |
883 { | |
884 throw new ConstructionException("null returned by g_variant_type_new_tuple(itemsArray.ptr, items.length)"); | |
885 Index: src/glib/Variant.d | |
886 =================================================================== | |
887 --- src/glib/Variant.d (revision 797) | |
888 +++ src/glib/Variant.d (working copy) | |
889 @@ -726,7 +726,7 @@ | |
890 public this (string[] strv) | |
891 { | |
892 // GVariant * g_variant_new_strv (const gchar * const *strv, gssize length); | |
893 - auto p = g_variant_new_strv(Str.toStringzArray(strv), strv.length); | |
894 + auto p = g_variant_new_strv(Str.toStringzArray(strv), cast(gint) strv.length); | |
895 if(p is null) | |
896 { | |
897 throw new ConstructionException("null returned by g_variant_new_strv(Str.toStringzArray(strv), strv.length)"); | |
898 @@ -1007,7 +1007,7 @@ | |
899 childrenArray[i] = children[i].getVariantStruct(); | |
900 } | |
901 | |
902 - auto p = g_variant_new_array((childType is null) ? null : childType.getVariantTypeStruct(), childrenArray.ptr, children.length); | |
903 + auto p = g_variant_new_array((childType is null) ? null : childType.getVariantTypeStruct(), childrenArray.ptr, cast(gint) children.length); | |
904 if(p is null) | |
905 { | |
906 throw new ConstructionException("null returned by g_variant_new_array((childType is null) ? null : childType.getVariantTypeStruct(), childrenArray.ptr, children.length)"); | |
907 @@ -1035,7 +1035,7 @@ | |
908 childrenArray[i] = children[i].getVariantStruct(); | |
909 } | |
910 | |
911 - auto p = g_variant_new_tuple(childrenArray.ptr, children.length); | |
912 + auto p = g_variant_new_tuple(childrenArray.ptr, cast(gint) children.length); | |
913 if(p is null) | |
914 { | |
915 throw new ConstructionException("null returned by g_variant_new_tuple(childrenArray.ptr, children.length)"); | |
916 Index: src/glib/RandG.d | |
917 =================================================================== | |
918 --- src/glib/RandG.d (revision 797) | |
919 +++ src/glib/RandG.d (working copy) | |
920 @@ -162,7 +162,7 @@ | |
921 public this (uint[] seed) | |
922 { | |
923 // GRand* g_rand_new_with_seed_array (const guint32 *seed, guint seed_length); | |
924 - auto p = g_rand_new_with_seed_array(seed.ptr, seed.length); | |
925 + auto p = g_rand_new_with_seed_array(seed.ptr, cast(gint) seed.length); | |
926 if(p is null) | |
927 { | |
928 throw new ConstructionException("null returned by g_rand_new_with_seed_array(seed.ptr, seed.length)"); | |
929 @@ -238,7 +238,7 @@ | |
930 public void setSeedArray(uint[] seed) | |
931 { | |
932 // void g_rand_set_seed_array (GRand *rand_, const guint32 *seed, guint seed_length); | |
933 - g_rand_set_seed_array(gRand, seed.ptr, seed.length); | |
934 + g_rand_set_seed_array(gRand, seed.ptr, cast(gint) seed.length); | |
935 } | |
936 | |
937 /** | |
938 Index: src/gobject/ObjectG.d | |
939 =================================================================== | |
940 --- src/gobject/ObjectG.d (revision 797) | |
941 +++ src/gobject/ObjectG.d (working copy) | |
942 @@ -481,7 +481,7 @@ | |
943 public this (GType objectType, GParameter[] parameters) | |
944 { | |
945 // gpointer g_object_newv (GType object_type, guint n_parameters, GParameter *parameters); | |
946 - auto p = g_object_newv(objectType, parameters.length, parameters.ptr); | |
947 + auto p = g_object_newv(objectType, cast(gint) parameters.length, parameters.ptr); | |
948 if(p is null) | |
949 { | |
950 throw new ConstructionException("null returned by g_object_newv(objectType, parameters.length, parameters.ptr)"); | |
951 Index: src/gobject/Signals.d | |
952 =================================================================== | |
953 --- src/gobject/Signals.d (revision 797) | |
954 +++ src/gobject/Signals.d (working copy) | |
955 @@ -151,7 +151,7 @@ | |
956 public static uint newv(string signalName, GType itype, GSignalFlags signalFlags, Closure classClosure, GSignalAccumulator accumulator, void* accuData, GSignalCMarshaller cMarshaller, GType returnType, GType[] paramTypes) | |
957 { | |
958 // guint g_signal_newv (const gchar *signal_name, GType itype, GSignalFlags signal_flags, GClosure *class_closure, GSignalAccumulator accumulator, gpointer accu_data, GSignalCMarshaller c_marshaller, GType return_type, guint n_params, GType *param_types); | |
959 - return g_signal_newv(Str.toStringz(signalName), itype, signalFlags, (classClosure is null) ? null : classClosure.getClosureStruct(), accumulator, accuData, cMarshaller, returnType, paramTypes.length, paramTypes.ptr); | |
960 + return g_signal_newv(Str.toStringz(signalName), itype, signalFlags, (classClosure is null) ? null : classClosure.getClosureStruct(), accumulator, accuData, cMarshaller, returnType, cast(gint) paramTypes.length, paramTypes.ptr); | |
961 } | |
962 | |
963 /** | |
964 Index: src/gio/ConverterT.d | |
965 =================================================================== | |
966 --- src/gio/ConverterT.d (revision 797) | |
967 +++ src/gio/ConverterT.d (working copy) | |
968 @@ -132,7 +132,7 @@ | |
969 // GConverterResult g_converter_convert (GConverter *converter, const void *inbuf, gsize inbuf_size, void *outbuf, gsize outbuf_size, GConverterFlags flags, gsize *bytes_read, gsize *bytes_written, GError **error); | |
970 GError* err = null; | |
971 | |
972 - auto p = g_converter_convert(getConverterTStruct(), inbuf.ptr, inbuf.length, outbuf.ptr, outbuf.length, flags, &bytesRead, &bytesWritten, &err); | |
973 + auto p = g_converter_convert(getConverterTStruct(), inbuf.ptr, cast(gint) inbuf.length, outbuf.ptr, cast(gint) outbuf.length, flags, &bytesRead, &bytesWritten, &err); | |
974 | |
975 if (err !is null) | |
976 { | |
977 Index: src/gio/InitableT.d | |
978 =================================================================== | |
979 --- src/gio/InitableT.d (revision 797) | |
980 +++ src/gio/InitableT.d (working copy) | |
981 @@ -196,7 +196,7 @@ | |
982 // gpointer g_initable_newv (GType object_type, guint n_parameters, GParameter *parameters, GCancellable *cancellable, GError **error); | |
983 GError* err = null; | |
984 | |
985 - auto p = g_initable_newv(objectType, parameters.length, parameters.ptr, (cancellable is null) ? null : cancellable.getCancellableStruct(), &err); | |
986 + auto p = g_initable_newv(objectType, cast(gint) parameters.length, parameters.ptr, (cancellable is null) ? null : cancellable.getCancellableStruct(), &err); | |
987 | |
988 if (err !is null) | |
989 { | |
990 Index: src/gio/Socket.d | |
991 =================================================================== | |
992 --- src/gio/Socket.d (revision 797) | |
993 +++ src/gio/Socket.d (working copy) | |
994 @@ -463,7 +463,7 @@ | |
995 GSocketAddress* outaddress = (address is null) ? null : address.getSocketAddressStruct(); | |
996 GError* err = null; | |
997 | |
998 - auto p = g_socket_receive_from(gSocket, &outaddress, buffer.ptr, buffer.length, (cancellable is null) ? null : cancellable.getCancellableStruct(), &err); | |
999 + auto p = g_socket_receive_from(gSocket, &outaddress, buffer.ptr, cast(gint) buffer.length, (cancellable is null) ? null : cancellable.getCancellableStruct(), &err); | |
1000 | |
1001 if (err !is null) | |
1002 { | |
1003 @@ -543,10 +543,10 @@ | |
1004 } | |
1005 | |
1006 GSocketControlMessage** outmessages = inoutmessages.ptr; | |
1007 - int numMessages = messages.length; | |
1008 + int numMessages = cast(int) messages.length; | |
1009 GError* err = null; | |
1010 | |
1011 - auto p = g_socket_receive_message(gSocket, &outaddress, vectors.ptr, vectors.length, &outmessages, &numMessages, &flags, (cancellable is null) ? null : cancellable.getCancellableStruct(), &err); | |
1012 + auto p = g_socket_receive_message(gSocket, &outaddress, vectors.ptr, cast(gint) vectors.length, &outmessages, &numMessages, &flags, (cancellable is null) ? null : cancellable.getCancellableStruct(), &err); | |
1013 | |
1014 if (err !is null) | |
1015 { | |
1016 @@ -675,10 +675,10 @@ | |
1017 { | |
1018 // gssize g_socket_send_message (GSocket *socket, GSocketAddress *address, GOutputVector *vectors, gint num_vectors, GSocketControlMessage **messages, gint num_messages, gint flags, GCancellable *cancellable, GError **error); | |
1019 GSocketControlMessage* outmessages = messages.ptr; | |
1020 - int numMessages = messages.length; | |
1021 + int numMessages = cast(int) messages.length; | |
1022 GError* err = null; | |
1023 | |
1024 - auto p = g_socket_send_message(gSocket, (address is null) ? null : address.getSocketAddressStruct(), vectors.ptr, vectors.length, &outmessages, numMessages, flags, (cancellable is null) ? null : cancellable.getCancellableStruct(), &err); | |
1025 + auto p = g_socket_send_message(gSocket, (address is null) ? null : address.getSocketAddressStruct(), vectors.ptr, cast(gint) vectors.length, &outmessages, numMessages, flags, (cancellable is null) ? null : cancellable.getCancellableStruct(), &err); | |
1026 | |
1027 if (err !is null) | |
1028 { | |
1029 Index: src/gio/ContentType.d | |
1030 =================================================================== | |
1031 --- src/gio/ContentType.d (revision 797) | |
1032 +++ src/gio/ContentType.d (working copy) | |
1033 @@ -207,7 +207,7 @@ | |
1034 public static string guess(string filename, char[] data, out int resultUncertain) | |
1035 { | |
1036 // char * g_content_type_guess (const char *filename, const guchar *data, gsize data_size, gboolean *result_uncertain); | |
1037 - return Str.toString(g_content_type_guess(Str.toStringz(filename), data.ptr, data.length, &resultUncertain)); | |
1038 + return Str.toString(g_content_type_guess(Str.toStringz(filename), data.ptr, cast(gint) data.length, &resultUncertain)); | |
1039 } | |
1040 | |
1041 /** | |
1042 Index: src/gio/UnixFDList.d | |
1043 =================================================================== | |
1044 --- src/gio/UnixFDList.d (revision 797) | |
1045 +++ src/gio/UnixFDList.d (working copy) | |
1046 @@ -131,7 +131,7 @@ | |
1047 public this (int[] fds) | |
1048 { | |
1049 // GUnixFDList * g_unix_fd_list_new_from_array (const gint *fds, gint n_fds); | |
1050 - auto p = g_unix_fd_list_new_from_array(fds.ptr, fds.length); | |
1051 + auto p = g_unix_fd_list_new_from_array(fds.ptr, cast(gint) fds.length); | |
1052 if(p is null) | |
1053 { | |
1054 throw new ConstructionException("null returned by g_unix_fd_list_new_from_array(fds.ptr, fds.length)"); | |
1055 Index: GNUmakefile | |
1056 =================================================================== | |
1057 --- GNUmakefile (revision 797) | |
1058 +++ GNUmakefile (working copy) | |
1059 @@ -19,7 +19,7 @@ | |
1060 endif | |
1061 | |
1062 ifeq ("$(DC)","dmd") | |
1063 - DCFLAGS=-O | |
1064 + DCFLAGS=-O | |
1065 output=-of$@ | |
1066 else ifeq ("$(DC)","ldc") | |
1067 DCFLAGS=-O | |
1068 Index: demos/dsss.conf | |
1069 =================================================================== | |
1070 --- demos/dsss.conf (revision 797) | |
1071 +++ demos/dsss.conf (working copy) | |
1072 @@ -6,30 +6,31 @@ | |
1073 | |
1074 requires = gtkd | |
1075 | |
1076 -[cairo] | |
1077 -type = subdir | |
1078 +#[cairo] | |
1079 +#type = subdir | |
1080 | |
1081 -[gtk] | |
1082 -type = subdir | |
1083 +#[gtk] | |
1084 +#type = subdir | |
1085 | |
1086 -[gtkD] | |
1087 -type = subdir | |
1088 +#[gtkD] | |
1089 +#type = subdir | |
1090 | |
1091 -[pango] | |
1092 -type = subdir | |
1093 +#[pango] | |
1094 +#type = subdir | |
1095 | |
1096 -[glade] | |
1097 -type = subdir | |
1098 +#[glade] | |
1099 +#type = subdir | |
1100 | |
1101 -[gl] | |
1102 -type = subdir | |
1103 +#[gl] | |
1104 +#type = subdir | |
1105 | |
1106 -[sourceView] | |
1107 -type = subdir | |
1108 - | |
1109 -[gda] | |
1110 +#[sourceView] | |
1111 #type = subdir | |
1112 | |
1113 +#[gda] | |
1114 +##type = subdir | |
1115 + | |
1116 #Please note that the gstreamer demos require Tango | |
1117 -[gstreamer] | |
1118 -type = subdir | |
1119 \ No newline at end of file | |
1120 + | |
1121 +#[gstreamer] | |
1122 +#type = subdir | |
1123 \ No newline at end of file | |
1124 Index: demos/gtkD/TestWindow/TestWindow.d | |
1125 =================================================================== | |
1126 --- demos/gtkD/TestWindow/TestWindow.d (revision 797) | |
1127 +++ demos/gtkD/TestWindow/TestWindow.d (working copy) | |
1128 @@ -937,7 +937,7 @@ | |
1129 while(1) | |
1130 { | |
1131 version(Tango) int buttonNum = Kiss.instance.natural(threadTestButtons.length); | |
1132 - else version(D_Version2) int buttonNum = uniform(0, threadTestButtons.length); | |
1133 + else version(D_Version2) int buttonNum = uniform(0, cast(int) threadTestButtons.length); | |
1134 else int buttonNum = rand()%threadTestButtons.length; | |
1135 Button button = threadTestButtons[buttonNum]; | |
1136 |