Mercurial > projects > doodle

comparison nobuild/gtkd-patches.diff @ 109:02fed38c6261

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Following updates to gtkd, updated gtkd-patches.diff and removed gtk64.diff as it is no longer necessary
author David Bryant <bagnose@gmail.com>
date Wed, 09 Mar 2011 13:32:06 +1030
parents ab745d8b10e5
children 403c34305a39
comparison
equal deleted inserted replaced
106:5677ba065636 109:02fed38c6261
1 Index: src/gdkpixbuf/PixbufAnimation.d
2 ===================================================================
3 --- src/gdkpixbuf/PixbufAnimation.d (revision 802)
4 +++ src/gdkpixbuf/PixbufAnimation.d (working copy)
5 @@ -167,7 +167,7 @@
6 * Adds a reference to an animation.
7 * Returns: The same as the animation argument.
8 */
9 - public PixbufAnimation doref()
10 + public override PixbufAnimation doref()
11 {
12 // GdkPixbufAnimation * gdk_pixbuf_animation_ref (GdkPixbufAnimation *animation);
13 auto p = gdk_pixbuf_animation_ref(gdkPixbufAnimation);
14 @@ -183,7 +183,7 @@
15 * gdk_pixbuf_animation_unref has been deprecated since version 2.0 and should not be used in newly-written code. Use g_object_unref().
16 * Removes a reference from an animation.
17 */
18 - public void unref()
19 + public override void unref()
20 {
21 // void gdk_pixbuf_animation_unref (GdkPixbufAnimation *animation);
22 gdk_pixbuf_animation_unref(gdkPixbufAnimation);
23 Index: src/gdk/Drawable.d
24 ===================================================================
25 --- src/gdk/Drawable.d (revision 802)
26 +++ src/gdk/Drawable.d (working copy)
27 @@ -197,7 +197,7 @@
28 * (Drawables were not objects in previous versions of GDK.)
29 * Returns: the same drawable passed in
30 */
31 - public Drawable doref()
32 + public override Drawable doref()
33 {
34 // GdkDrawable* gdk_drawable_ref (GdkDrawable *drawable);
35 auto p = gdk_drawable_ref(gdkDrawable);
36 @@ -213,7 +213,7 @@
37 * gdk_drawable_unref has been deprecated since version 2.0 and should not be used in newly-written code. Use g_object_unref() instead.
38 * Deprecated equivalent of calling g_object_unref() on drawable.
39 */
40 - public void unref()
41 + public override void unref()
42 {
43 // void gdk_drawable_unref (GdkDrawable *drawable);
44 gdk_drawable_unref(gdkDrawable);
45 Index: src/gdk/GC.d
46 ===================================================================
47 --- src/gdk/GC.d (revision 802)
48 +++ src/gdk/GC.d (working copy)
49 @@ -211,7 +211,7 @@
50 * Deprecated function; use g_object_ref() instead.
51 * Returns: the gc.
52 */
53 - public GC doref()
54 + public override GC doref()
55 {
56 // GdkGC * gdk_gc_ref (GdkGC *gc);
57 auto p = gdk_gc_ref(gdkGC);
58 @@ -227,7 +227,7 @@
59 * gdk_gc_unref has been deprecated since version 2.0 and should not be used in newly-written code. Use g_object_unref() instead.
60 * Decrement the reference count of gc.
61 */
62 - public void unref()
63 + public override void unref()
64 {
65 // void gdk_gc_unref (GdkGC *gc);
66 gdk_gc_unref(gdkGC);
67 Index: src/gtk/OrientableT.d
68 ===================================================================
69 --- src/gtk/OrientableT.d (revision 802)
70 +++ src/gtk/OrientableT.d (working copy)
71 @@ -92,7 +92,7 @@
72 * Since 2.16
73 * Returns: the orientation of the orientable.
74 */
75 - public GtkOrientation getOrientation()
76 + public override GtkOrientation getOrientation()
77 {
78 // GtkOrientation gtk_orientable_get_orientation (GtkOrientable *orientable);
79 return gtk_orientable_get_orientation(getOrientableTStruct());
80 @@ -104,7 +104,7 @@
81 * Params:
82 * orientation = the orientable's new orientation.
83 */
84 - public void setOrientation(GtkOrientation orientation)
85 + public override void setOrientation(GtkOrientation orientation)
86 {
87 // void gtk_orientable_set_orientation (GtkOrientable *orientable, GtkOrientation orientation);
88 gtk_orientable_set_orientation(getOrientableTStruct(), orientation);
89 Index: src/gtk/ScaleButton.d
90 ===================================================================
91 --- src/gtk/ScaleButton.d (revision 802)
92 +++ src/gtk/ScaleButton.d (working copy)
93 @@ -366,6 +366,7 @@
94 return new Widget(cast(GtkWidget*) p);
95 }
96
97 + /+
98 /**
99 * Warning
100 * gtk_scale_button_set_orientation has been deprecated since version 2.16 and should not be used in newly-written code. Use gtk_orientable_set_orientation() instead.
101 @@ -392,4 +393,5 @@
102 // GtkOrientation gtk_scale_button_get_orientation (GtkScaleButton *button);
103 return gtk_scale_button_get_orientation(gtkScaleButton);
104 }
105 + +/
106 }
107 Index: src/gtk/Style.d
108 ===================================================================
109 --- src/gtk/Style.d (revision 802)
110 +++ src/gtk/Style.d (working copy)
111 @@ -281,7 +281,7 @@
112 * Increase the reference count of style.
113 * Returns:style.
114 */
115 - public Style doref()
116 + public override Style doref()
117 {
118 // GtkStyle* gtk_style_ref (GtkStyle *style);
119 auto p = gtk_style_ref(gtkStyle);
120 @@ -297,7 +297,7 @@
121 * gtk_style_unref has been deprecated since version 2.0 and should not be used in newly-written code. use g_object_unref() instead.
122 * Decrease the reference count of style.
123 */
124 - public void unref()
125 + public override void unref()
126 {
127 // void gtk_style_unref (GtkStyle *style);
128 gtk_style_unref(gtkStyle);
129 Index: src/gtk/BuildableT.d
130 ===================================================================
131 --- src/gtk/BuildableT.d (revision 802)
132 +++ src/gtk/BuildableT.d (working copy)
133 @@ -95,7 +95,7 @@
134 protected GtkBuildable* gtkBuildable;
135
136
137 - public GtkBuildable* getBuildableTStruct()
138 + public override GtkBuildable* getBuildableTStruct()
139 {
140 return cast(GtkBuildable*)getStruct();
141 }
142 @@ -111,7 +111,7 @@
143 * buildable = a GtkBuildable
144 * name = name to set
145 */
146 - public void buildableSetName(string name)
147 + public override void buildableSetName(string name)
148 {
149 // void gtk_buildable_set_name (GtkBuildable *buildable, const gchar *name);
150 gtk_buildable_set_name(getBuildableTStruct(), Str.toStringz(name));
151 @@ -127,7 +127,7 @@
152 * buildable = a GtkBuildable
153 * Returns: the name set with gtk_buildable_set_name()
154 */
155 - public string buildableGetName()
156 + public override string buildableGetName()
157 {
158 // const gchar * gtk_buildable_get_name (GtkBuildable *buildable);
159 return Str.toString(gtk_buildable_get_name(getBuildableTStruct()));
160 @@ -142,7 +142,7 @@
161 * child = child to add
162 * type = kind of child or NULL. allow-none.
163 */
164 - public void addChild(Builder builder, ObjectG child, string type)
165 + public override void addChild(Builder builder, ObjectG child, string type)
166 {
167 // void gtk_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, const gchar *type);
168 gtk_buildable_add_child(getBuildableTStruct(), (builder is null) ? null : builder.getBuilderStruct(), (child is null) ? null : child.getObjectGStruct(), Str.toStringz(type));
169 @@ -156,7 +156,7 @@
170 * name = name of property
171 * value = value of property
172 */
173 - public void setBuildableProperty(Builder builder, string name, Value value)
174 + public override void setBuildableProperty(Builder builder, string name, Value value)
175 {
176 // void gtk_buildable_set_buildable_property (GtkBuildable *buildable, GtkBuilder *builder, const gchar *name, const GValue *value);
177 gtk_buildable_set_buildable_property(getBuildableTStruct(), (builder is null) ? null : builder.getBuilderStruct(), Str.toStringz(name), (value is null) ? null : value.getValueStruct());
178 @@ -172,7 +172,7 @@
179 * name = name of child to construct
180 * Returns: the constructed child
181 */
182 - public ObjectG constructChild(Builder builder, string name)
183 + public override ObjectG constructChild(Builder builder, string name)
184 {
185 // GObject * gtk_buildable_construct_child (GtkBuildable *buildable, GtkBuilder *builder, const gchar *name);
186 auto p = gtk_buildable_construct_child(getBuildableTStruct(), (builder is null) ? null : builder.getBuilderStruct(), Str.toStringz(name));
187 @@ -195,7 +195,7 @@
188 * to parser functions
189 * Returns: TRUE if a object has a custom implementation, FALSE if it doesn't.
190 */
191 - public int customTagStart(Builder builder, ObjectG child, string tagname, GMarkupParser* parser, void** data)
192 + public override int customTagStart(Builder builder, ObjectG child, string tagname, GMarkupParser* parser, void** data)
193 {
194 // gboolean gtk_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, const gchar *tagname, GMarkupParser *parser, gpointer *data);
195 return gtk_buildable_custom_tag_start(getBuildableTStruct(), (builder is null) ? null : builder.getBuilderStruct(), (child is null) ? null : child.getObjectGStruct(), Str.toStringz(tagname), parser, data);
196 @@ -211,7 +211,7 @@
197 * tagname = name of tag
198 * data = user data that will be passed in to parser functions
199 */
200 - public void customTagEnd(Builder builder, ObjectG child, string tagname, void** data)
201 + public override void customTagEnd(Builder builder, ObjectG child, string tagname, void** data)
202 {
203 // void gtk_buildable_custom_tag_end (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, const gchar *tagname, gpointer *data);
204 gtk_buildable_custom_tag_end(getBuildableTStruct(), (builder is null) ? null : builder.getBuilderStruct(), (child is null) ? null : child.getObjectGStruct(), Str.toStringz(tagname), data);
205 @@ -227,7 +227,7 @@
206 * tagname = the name of the tag
207 * data = user data created in custom_tag_start
208 */
209 - public void customFinished(Builder builder, ObjectG child, string tagname, void* data)
210 + public override void customFinished(Builder builder, ObjectG child, string tagname, void* data)
211 {
212 // void gtk_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, const gchar *tagname, gpointer data);
213 gtk_buildable_custom_finished(getBuildableTStruct(), (builder is null) ? null : builder.getBuilderStruct(), (child is null) ? null : child.getObjectGStruct(), Str.toStringz(tagname), data);
214 @@ -243,7 +243,7 @@
215 * Params:
216 * builder = a GtkBuilder
217 */
218 - public void parserFinished(Builder builder)
219 + public override void parserFinished(Builder builder)
220 {
221 // void gtk_buildable_parser_finished (GtkBuildable *buildable, GtkBuilder *builder);
222 gtk_buildable_parser_finished(getBuildableTStruct(), (builder is null) ? null : builder.getBuilderStruct());
223 @@ -257,7 +257,7 @@
224 * childname = name of child
225 * Returns: the internal child of the buildable object
226 */
227 - public ObjectG getInternalChild(Builder builder, string childname)
228 + public override ObjectG getInternalChild(Builder builder, string childname)
229 {
230 // GObject * gtk_buildable_get_internal_child (GtkBuildable *buildable, GtkBuilder *builder, const gchar *childname);
231 auto p = gtk_buildable_get_internal_child(getBuildableTStruct(), (builder is null) ? null : builder.getBuilderStruct(), Str.toStringz(childname));
232 Index: src/gtk/ObjectGtk.d
233 ===================================================================
234 --- src/gtk/ObjectGtk.d (revision 802)
235 +++ src/gtk/ObjectGtk.d (working copy)
236 @@ -227,7 +227,7 @@
237 * Increases the reference count of the object.
238 * Returns:object.
239 */
240 - public ObjectGtk doref()
241 + public override ObjectGtk doref()
242 {
243 // GtkObject* gtk_object_ref (GtkObject *object);
244 auto p = gtk_object_ref(gtkObject);
245 @@ -244,7 +244,7 @@
246 * Decreases the reference count of an object. When its reference count drops
247 * to 0, the object is finalized (i.e. its memory is freed).
248 */
249 - public void unref()
250 + public override void unref()
251 {
252 // void gtk_object_unref (GtkObject *object);
253 gtk_object_unref(gtkObject);
254 Index: src/gtk/TextBuffer.d
255 ===================================================================
256 --- src/gtk/TextBuffer.d (revision 802)
257 +++ src/gtk/TextBuffer.d (working copy)
258 @@ -125,7 +125,7 @@
259
260 version = druntime;
261 } else {
262 - private import std.stdarg;
263 + private import core.vararg;
264 }
265
266
267 Index: src/gtk/RecentChooserMenu.d
268 ===================================================================
269 --- src/gtk/RecentChooserMenu.d (revision 802)
270 +++ src/gtk/RecentChooserMenu.d (working copy)
271 @@ -194,6 +194,7 @@
272 this(cast(GtkRecentChooserMenu*) p);
273 }
274
275 + /+
276 /**
277 * Returns the value set by gtk_recent_chooser_menu_set_show_numbers().
278 * Since 2.10
279 @@ -219,4 +220,5 @@
280 // void gtk_recent_chooser_menu_set_show_numbers (GtkRecentChooserMenu *menu, gboolean show_numbers);
281 gtk_recent_chooser_menu_set_show_numbers(gtkRecentChooserMenu, showNumbers);
282 }
283 + +/
284 }
285 Index: src/gtk/Toolbar.d
286 ===================================================================
287 --- src/gtk/Toolbar.d (revision 802)
288 +++ src/gtk/Toolbar.d (working copy)
289 @@ -437,6 +437,7 @@
290 gtk_toolbar_set_show_arrow(gtkToolbar, showArrow);
291 }
292
293 + /+
294 /**
295 * Warning
296 * gtk_toolbar_set_orientation has been deprecated since version 2.16 and should not be used in newly-written code. Use gtk_orientable_set_orientation() instead.
297 @@ -449,6 +450,7 @@
298 // void gtk_toolbar_set_orientation (GtkToolbar *toolbar, GtkOrientation orientation);
299 gtk_toolbar_set_orientation(gtkToolbar, orientation);
300 }
301 + +/
302
303 /**
304 * Warning
305 @@ -486,6 +488,7 @@
306 return gtk_toolbar_get_show_arrow(gtkToolbar);
307 }
308
309 + /+
310 /**
311 * Warning
312 * gtk_toolbar_get_orientation has been deprecated since version 2.16 and should not be used in newly-written code. Use gtk_orientable_get_orientation() instead.
313 @@ -498,6 +501,7 @@
314 // GtkOrientation gtk_toolbar_get_orientation (GtkToolbar *toolbar);
315 return gtk_toolbar_get_orientation(gtkToolbar);
316 }
317 + +/
318
319 /**
320 * Retrieves whether the toolbar has text, icons, or both . See
321 @@ -516,11 +520,13 @@
322 * Retrieves the icon size for the toolbar. See gtk_toolbar_set_icon_size().
323 * Returns: the current icon size for the icons onthe toolbar.. type int
324 */
325 + /+
326 public GtkIconSize getIconSize()
327 {
328 // GtkIconSize gtk_toolbar_get_icon_size (GtkToolbar *toolbar);
329 return gtk_toolbar_get_icon_size(gtkToolbar);
330 }
331 + +/
332
333 /**
334 * Warning
335 @@ -542,11 +548,13 @@
336 * Since 2.4
337 * Returns: The relief style of buttons on toolbar.
338 */
339 + /+
340 public GtkReliefStyle getReliefStyle()
341 {
342 // GtkReliefStyle gtk_toolbar_get_relief_style (GtkToolbar *toolbar);
343 return gtk_toolbar_get_relief_style(gtkToolbar);
344 }
345 + +/
346
347 /**
348 * Warning
349 Index: src/gtk/TreeViewColumn.d
350 ===================================================================
351 --- src/gtk/TreeViewColumn.d (revision 802)
352 +++ src/gtk/TreeViewColumn.d (working copy)
353 @@ -218,6 +218,7 @@
354 this(cast(GtkTreeViewColumn*) p);
355 }
356
357 + /+
358 /**
359 * Packs the cell into the beginning of the column. If expand is FALSE, then
360 * the cell is allocated no more space than it needs. Any unused space is divided
361 @@ -254,6 +255,7 @@
362 // void gtk_tree_view_column_clear (GtkTreeViewColumn *tree_column);
363 gtk_tree_view_column_clear(gtkTreeViewColumn);
364 }
365 + +/
366
367 /**
368 * Warning
369 @@ -273,6 +275,7 @@
370 return new ListG(cast(GList*) p);
371 }
372
373 + /+
374 /**
375 * Adds an attribute mapping to the list in tree_column. The column is the
376 * column of the model to get a value from, and the attribute is the
377 @@ -320,6 +323,7 @@
378 // void gtk_tree_view_column_clear_attributes (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell_renderer);
379 gtk_tree_view_column_clear_attributes(gtkTreeViewColumn, (cellRenderer is null) ? null : cellRenderer.getCellRendererStruct());
380 }
381 + +/
382
383 /**
384 * Sets the spacing field of tree_column, which is the number of pixels to
385 Index: src/gio/InetAddress.d
386 ===================================================================
387 --- src/gio/InetAddress.d (revision 802)
388 +++ src/gio/InetAddress.d (working copy)
389 @@ -205,7 +205,7 @@
390 * Since 2.22
391 * Returns: a representation of address as a string, which should befreed after use.
392 */
393 - public string toString()
394 + public override string toString()
395 {
396 // gchar * g_inet_address_to_string (GInetAddress *address);
397 return Str.toString(g_inet_address_to_string(gInetAddress));
398 Index: src/gio/UnixInputStream.d
399 ===================================================================
400 --- src/gio/UnixInputStream.d (revision 802)
401 +++ src/gio/UnixInputStream.d (working copy)
402 @@ -171,9 +171,11 @@
403 * Since 2.20
404 * Returns: The file descriptor of stream
405 */
406 + /+
407 public int getFd()
408 {
409 // gint g_unix_input_stream_get_fd (GUnixInputStream *stream);
410 return g_unix_input_stream_get_fd(gUnixInputStream);
411 }
412 + +/
413 }
414 Index: src/gio/UnixOutputStream.d
415 ===================================================================
416 --- src/gio/UnixOutputStream.d (revision 802)
417 +++ src/gio/UnixOutputStream.d (working copy)
418 @@ -171,9 +171,11 @@
419 * Since 2.20
420 * Returns: The file descriptor of stream
421 */
422 + /+
423 public int getFd()
424 {
425 // gint g_unix_output_stream_get_fd (GUnixOutputStream *stream);
426 return g_unix_output_stream_get_fd(gUnixOutputStream);
427 }
428 + +/
429 }
1 Index: GNUmakefile 430 Index: GNUmakefile
2 =================================================================== 431 ===================================================================
3 --- GNUmakefile (revision 797) 432 --- GNUmakefile (revision 802)
4 +++ GNUmakefile (working copy) 433 +++ GNUmakefile (working copy)
5 @@ -1,6 +1,7 @@ 434 @@ -1,6 +1,7 @@
6 #makeAll.sh 435 #makeAll.sh
7 SHELL=/bin/sh 436 SHELL=/bin/sh
8 -prefix=/usr/local 437 -prefix=/usr/local
14 @@ -19,7 +20,7 @@ 443 @@ -19,7 +20,7 @@
15 endif 444 endif
16 445
17 ifeq ("$(DC)","dmd") 446 ifeq ("$(DC)","dmd")
18 - DCFLAGS=-O 447 - DCFLAGS=-O
19 + DCFLAGS=-O -w -wi 448 + DCFLAGS=-O -w -wi -m32
20 output=-of$@ 449 output=-of$@
21 else ifeq ("$(DC)","ldc") 450 else ifeq ("$(DC)","ldc")
22 DCFLAGS=-O 451 DCFLAGS=-O
23 Index: src/gdkpixbuf/PixbufAnimation.d
24 ===================================================================
25 --- src/gdkpixbuf/PixbufAnimation.d (revision 797)
26 +++ src/gdkpixbuf/PixbufAnimation.d (working copy)
27 @@ -167,7 +167,7 @@
28 * Adds a reference to an animation.
29 * Returns: The same as the animation argument.
30 */
31 - public PixbufAnimation doref()
32 + public override PixbufAnimation doref()
33 {
34 // GdkPixbufAnimation * gdk_pixbuf_animation_ref (GdkPixbufAnimation *animation);
35 auto p = gdk_pixbuf_animation_ref(gdkPixbufAnimation);
36 @@ -183,7 +183,7 @@
37 * gdk_pixbuf_animation_unref has been deprecated since version 2.0 and should not be used in newly-written code. Use g_object_unref().
38 * Removes a reference from an animation.
39 */
40 - public void unref()
41 + public override void unref()
42 {
43 // void gdk_pixbuf_animation_unref (GdkPixbufAnimation *animation);
44 gdk_pixbuf_animation_unref(gdkPixbufAnimation);
45 Index: src/gdk/Drawable.d
46 ===================================================================
47 --- src/gdk/Drawable.d (revision 797)
48 +++ src/gdk/Drawable.d (working copy)
49 @@ -197,7 +197,7 @@
50 * (Drawables were not objects in previous versions of GDK.)
51 * Returns: the same drawable passed in
52 */
53 - public Drawable doref()
54 + public override Drawable doref()
55 {
56 // GdkDrawable* gdk_drawable_ref (GdkDrawable *drawable);
57 auto p = gdk_drawable_ref(gdkDrawable);
58 @@ -213,7 +213,7 @@
59 * gdk_drawable_unref has been deprecated since version 2.0 and should not be used in newly-written code. Use g_object_unref() instead.
60 * Deprecated equivalent of calling g_object_unref() on drawable.
61 */
62 - public void unref()
63 + public override void unref()
64 {
65 // void gdk_drawable_unref (GdkDrawable *drawable);
66 gdk_drawable_unref(gdkDrawable);
67 Index: src/gdk/GC.d
68 ===================================================================
69 --- src/gdk/GC.d (revision 797)
70 +++ src/gdk/GC.d (working copy)
71 @@ -211,7 +211,7 @@
72 * Deprecated function; use g_object_ref() instead.
73 * Returns: the gc.
74 */
75 - public GC doref()
76 + public override GC doref()
77 {
78 // GdkGC * gdk_gc_ref (GdkGC *gc);
79 auto p = gdk_gc_ref(gdkGC);
80 @@ -227,7 +227,7 @@
81 * gdk_gc_unref has been deprecated since version 2.0 and should not be used in newly-written code. Use g_object_unref() instead.
82 * Decrement the reference count of gc.
83 */
84 - public void unref()
85 + public override void unref()
86 {
87 // void gdk_gc_unref (GdkGC *gc);
88 gdk_gc_unref(gdkGC);
89 Index: src/gtk/OrientableT.d
90 ===================================================================
91 --- src/gtk/OrientableT.d (revision 797)
92 +++ src/gtk/OrientableT.d (working copy)
93 @@ -92,7 +92,7 @@
94 * Since 2.16
95 * Returns: the orientation of the orientable.
96 */
97 - public GtkOrientation getOrientation()
98 + public override GtkOrientation getOrientation()
99 {
100 // GtkOrientation gtk_orientable_get_orientation (GtkOrientable *orientable);
101 return gtk_orientable_get_orientation(getOrientableTStruct());
102 @@ -104,7 +104,7 @@
103 * Params:
104 * orientation = the orientable's new orientation.
105 */
106 - public void setOrientation(GtkOrientation orientation)
107 + public override void setOrientation(GtkOrientation orientation)
108 {
109 // void gtk_orientable_set_orientation (GtkOrientable *orientable, GtkOrientation orientation);
110 gtk_orientable_set_orientation(getOrientableTStruct(), orientation);
111 Index: src/gtk/ScaleButton.d
112 ===================================================================
113 --- src/gtk/ScaleButton.d (revision 797)
114 +++ src/gtk/ScaleButton.d (working copy)
115 @@ -366,6 +366,7 @@
116 return new Widget(cast(GtkWidget*) p);
117 }
118
119 + /+
120 /**
121 * Warning
122 * gtk_scale_button_set_orientation has been deprecated since version 2.16 and should not be used in newly-written code. Use gtk_orientable_set_orientation() instead.
123 @@ -392,4 +393,5 @@
124 // GtkOrientation gtk_scale_button_get_orientation (GtkScaleButton *button);
125 return gtk_scale_button_get_orientation(gtkScaleButton);
126 }
127 + +/
128 }
129 Index: src/gtk/Style.d
130 ===================================================================
131 --- src/gtk/Style.d (revision 797)
132 +++ src/gtk/Style.d (working copy)
133 @@ -281,7 +281,7 @@
134 * Increase the reference count of style.
135 * Returns:style.
136 */
137 - public Style doref()
138 + public override Style doref()
139 {
140 // GtkStyle* gtk_style_ref (GtkStyle *style);
141 auto p = gtk_style_ref(gtkStyle);
142 @@ -297,7 +297,7 @@
143 * gtk_style_unref has been deprecated since version 2.0 and should not be used in newly-written code. use g_object_unref() instead.
144 * Decrease the reference count of style.
145 */
146 - public void unref()
147 + public override void unref()
148 {
149 // void gtk_style_unref (GtkStyle *style);
150 gtk_style_unref(gtkStyle);
151 Index: src/gtk/BuildableT.d
152 ===================================================================
153 --- src/gtk/BuildableT.d (revision 797)
154 +++ src/gtk/BuildableT.d (working copy)
155 @@ -95,7 +95,7 @@
156 protected GtkBuildable* gtkBuildable;
157
158
159 - public GtkBuildable* getBuildableTStruct()
160 + public override GtkBuildable* getBuildableTStruct()
161 {
162 return cast(GtkBuildable*)getStruct();
163 }
164 @@ -111,7 +111,7 @@
165 * buildable = a GtkBuildable
166 * name = name to set
167 */
168 - public void buildableSetName(string name)
169 + public override void buildableSetName(string name)
170 {
171 // void gtk_buildable_set_name (GtkBuildable *buildable, const gchar *name);
172 gtk_buildable_set_name(getBuildableTStruct(), Str.toStringz(name));
173 @@ -127,7 +127,7 @@
174 * buildable = a GtkBuildable
175 * Returns: the name set with gtk_buildable_set_name()
176 */
177 - public string buildableGetName()
178 + public override string buildableGetName()
179 {
180 // const gchar * gtk_buildable_get_name (GtkBuildable *buildable);
181 return Str.toString(gtk_buildable_get_name(getBuildableTStruct()));
182 @@ -142,7 +142,7 @@
183 * child = child to add
184 * type = kind of child or NULL. allow-none.
185 */
186 - public void addChild(Builder builder, ObjectG child, string type)
187 + public override void addChild(Builder builder, ObjectG child, string type)
188 {
189 // void gtk_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, const gchar *type);
190 gtk_buildable_add_child(getBuildableTStruct(), (builder is null) ? null : builder.getBuilderStruct(), (child is null) ? null : child.getObjectGStruct(), Str.toStringz(type));
191 @@ -156,7 +156,7 @@
192 * name = name of property
193 * value = value of property
194 */
195 - public void setBuildableProperty(Builder builder, string name, Value value)
196 + public override void setBuildableProperty(Builder builder, string name, Value value)
197 {
198 // void gtk_buildable_set_buildable_property (GtkBuildable *buildable, GtkBuilder *builder, const gchar *name, const GValue *value);
199 gtk_buildable_set_buildable_property(getBuildableTStruct(), (builder is null) ? null : builder.getBuilderStruct(), Str.toStringz(name), (value is null) ? null : value.getValueStruct());
200 @@ -172,7 +172,7 @@
201 * name = name of child to construct
202 * Returns: the constructed child
203 */
204 - public ObjectG constructChild(Builder builder, string name)
205 + public override ObjectG constructChild(Builder builder, string name)
206 {
207 // GObject * gtk_buildable_construct_child (GtkBuildable *buildable, GtkBuilder *builder, const gchar *name);
208 auto p = gtk_buildable_construct_child(getBuildableTStruct(), (builder is null) ? null : builder.getBuilderStruct(), Str.toStringz(name));
209 @@ -195,7 +195,7 @@
210 * to parser functions
211 * Returns: TRUE if a object has a custom implementation, FALSE if it doesn't.
212 */
213 - public int customTagStart(Builder builder, ObjectG child, string tagname, GMarkupParser* parser, void** data)
214 + public override int customTagStart(Builder builder, ObjectG child, string tagname, GMarkupParser* parser, void** data)
215 {
216 // gboolean gtk_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, const gchar *tagname, GMarkupParser *parser, gpointer *data);
217 return gtk_buildable_custom_tag_start(getBuildableTStruct(), (builder is null) ? null : builder.getBuilderStruct(), (child is null) ? null : child.getObjectGStruct(), Str.toStringz(tagname), parser, data);
218 @@ -211,7 +211,7 @@
219 * tagname = name of tag
220 * data = user data that will be passed in to parser functions
221 */
222 - public void customTagEnd(Builder builder, ObjectG child, string tagname, void** data)
223 + public override void customTagEnd(Builder builder, ObjectG child, string tagname, void** data)
224 {
225 // void gtk_buildable_custom_tag_end (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, const gchar *tagname, gpointer *data);
226 gtk_buildable_custom_tag_end(getBuildableTStruct(), (builder is null) ? null : builder.getBuilderStruct(), (child is null) ? null : child.getObjectGStruct(), Str.toStringz(tagname), data);
227 @@ -227,7 +227,7 @@
228 * tagname = the name of the tag
229 * data = user data created in custom_tag_start
230 */
231 - public void customFinished(Builder builder, ObjectG child, string tagname, void* data)
232 + public override void customFinished(Builder builder, ObjectG child, string tagname, void* data)
233 {
234 // void gtk_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, const gchar *tagname, gpointer data);
235 gtk_buildable_custom_finished(getBuildableTStruct(), (builder is null) ? null : builder.getBuilderStruct(), (child is null) ? null : child.getObjectGStruct(), Str.toStringz(tagname), data);
236 @@ -243,7 +243,7 @@
237 * Params:
238 * builder = a GtkBuilder
239 */
240 - public void parserFinished(Builder builder)
241 + public override void parserFinished(Builder builder)
242 {
243 // void gtk_buildable_parser_finished (GtkBuildable *buildable, GtkBuilder *builder);
244 gtk_buildable_parser_finished(getBuildableTStruct(), (builder is null) ? null : builder.getBuilderStruct());
245 @@ -257,7 +257,7 @@
246 * childname = name of child
247 * Returns: the internal child of the buildable object
248 */
249 - public ObjectG getInternalChild(Builder builder, string childname)
250 + public override ObjectG getInternalChild(Builder builder, string childname)
251 {
252 // GObject * gtk_buildable_get_internal_child (GtkBuildable *buildable, GtkBuilder *builder, const gchar *childname);
253 auto p = gtk_buildable_get_internal_child(getBuildableTStruct(), (builder is null) ? null : builder.getBuilderStruct(), Str.toStringz(childname));
254 Index: src/gtk/ObjectGtk.d
255 ===================================================================
256 --- src/gtk/ObjectGtk.d (revision 797)
257 +++ src/gtk/ObjectGtk.d (working copy)
258 @@ -227,7 +227,7 @@
259 * Increases the reference count of the object.
260 * Returns:object.
261 */
262 - public ObjectGtk doref()
263 + public override ObjectGtk doref()
264 {
265 // GtkObject* gtk_object_ref (GtkObject *object);
266 auto p = gtk_object_ref(gtkObject);
267 @@ -244,7 +244,7 @@
268 * Decreases the reference count of an object. When its reference count drops
269 * to 0, the object is finalized (i.e. its memory is freed).
270 */
271 - public void unref()
272 + public override void unref()
273 {
274 // void gtk_object_unref (GtkObject *object);
275 gtk_object_unref(gtkObject);
276 Index: src/gtk/TextBuffer.d
277 ===================================================================
278 --- src/gtk/TextBuffer.d (revision 797)
279 +++ src/gtk/TextBuffer.d (working copy)
280 @@ -119,7 +119,7 @@
281 version(Tango) {
282 private import tango.core.Vararg;
283 } else {
284 - private import std.stdarg;
285 + private import core.vararg;
286 }
287
288
289 Index: src/gtk/RecentChooserMenu.d
290 ===================================================================
291 --- src/gtk/RecentChooserMenu.d (revision 797)
292 +++ src/gtk/RecentChooserMenu.d (working copy)
293 @@ -194,6 +194,7 @@
294 this(cast(GtkRecentChooserMenu*) p);
295 }
296
297 + /+
298 /**
299 * Returns the value set by gtk_recent_chooser_menu_set_show_numbers().
300 * Since 2.10
301 @@ -219,4 +220,5 @@
302 // void gtk_recent_chooser_menu_set_show_numbers (GtkRecentChooserMenu *menu, gboolean show_numbers);
303 gtk_recent_chooser_menu_set_show_numbers(gtkRecentChooserMenu, showNumbers);
304 }
305 + +/
306 }
307 Index: src/gtk/Toolbar.d
308 ===================================================================
309 --- src/gtk/Toolbar.d (revision 797)
310 +++ src/gtk/Toolbar.d (working copy)
311 @@ -437,6 +437,7 @@
312 gtk_toolbar_set_show_arrow(gtkToolbar, showArrow);
313 }
314
315 + /+
316 /**
317 * Warning
318 * gtk_toolbar_set_orientation has been deprecated since version 2.16 and should not be used in newly-written code. Use gtk_orientable_set_orientation() instead.
319 @@ -449,6 +450,7 @@
320 // void gtk_toolbar_set_orientation (GtkToolbar *toolbar, GtkOrientation orientation);
321 gtk_toolbar_set_orientation(gtkToolbar, orientation);
322 }
323 + +/
324
325 /**
326 * Warning
327 @@ -486,6 +488,7 @@
328 return gtk_toolbar_get_show_arrow(gtkToolbar);
329 }
330
331 + /+
332 /**
333 * Warning
334 * gtk_toolbar_get_orientation has been deprecated since version 2.16 and should not be used in newly-written code. Use gtk_orientable_get_orientation() instead.
335 @@ -498,6 +501,7 @@
336 // GtkOrientation gtk_toolbar_get_orientation (GtkToolbar *toolbar);
337 return gtk_toolbar_get_orientation(gtkToolbar);
338 }
339 + +/
340
341 /**
342 * Retrieves whether the toolbar has text, icons, or both . See
343 @@ -516,11 +520,13 @@
344 * Retrieves the icon size for the toolbar. See gtk_toolbar_set_icon_size().
345 * Returns: the current icon size for the icons onthe toolbar.. type int
346 */
347 + /+
348 public GtkIconSize getIconSize()
349 {
350 // GtkIconSize gtk_toolbar_get_icon_size (GtkToolbar *toolbar);
351 return gtk_toolbar_get_icon_size(gtkToolbar);
352 }
353 + +/
354
355 /**
356 * Warning
357 @@ -542,11 +548,13 @@
358 * Since 2.4
359 * Returns: The relief style of buttons on toolbar.
360 */
361 + /+
362 public GtkReliefStyle getReliefStyle()
363 {
364 // GtkReliefStyle gtk_toolbar_get_relief_style (GtkToolbar *toolbar);
365 return gtk_toolbar_get_relief_style(gtkToolbar);
366 }
367 + +/
368
369 /**
370 * Warning
371 Index: src/gtk/TreeViewColumn.d
372 ===================================================================
373 --- src/gtk/TreeViewColumn.d (revision 797)
374 +++ src/gtk/TreeViewColumn.d (working copy)
375 @@ -218,6 +218,7 @@
376 this(cast(GtkTreeViewColumn*) p);
377 }
378
379 + /+
380 /**
381 * Packs the cell into the beginning of the column. If expand is FALSE, then
382 * the cell is allocated no more space than it needs. Any unused space is divided
383 @@ -254,6 +255,7 @@
384 // void gtk_tree_view_column_clear (GtkTreeViewColumn *tree_column);
385 gtk_tree_view_column_clear(gtkTreeViewColumn);
386 }
387 + +/
388
389 /**
390 * Warning
391 @@ -273,6 +275,7 @@
392 return new ListG(cast(GList*) p);
393 }
394
395 + /+
396 /**
397 * Adds an attribute mapping to the list in tree_column. The column is the
398 * column of the model to get a value from, and the attribute is the
399 @@ -320,6 +323,7 @@
400 // void gtk_tree_view_column_clear_attributes (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell_renderer);
401 gtk_tree_view_column_clear_attributes(gtkTreeViewColumn, (cellRenderer is null) ? null : cellRenderer.getCellRendererStruct());
402 }
403 + +/
404
405 /**
406 * Sets the spacing field of tree_column, which is the number of pixels to
407 Index: src/cairo/Context.d
408 ===================================================================
409 --- src/cairo/Context.d (revision 797)
410 +++ src/cairo/Context.d (working copy)
411 @@ -152,6 +152,10 @@
412 // cairo_t* gdk_cairo_create (GdkDrawable *);
413 this(gdk_cairo_create(drawable.getDrawableStruct()));
414 }
415 +
416 + ~this () {
417 + cairo_destroy(cairo);
418 + }
419
420 /**
421 * Sets the specified GdkColor as the source color of cr.
422 Index: src/gio/InetAddress.d
423 ===================================================================
424 --- src/gio/InetAddress.d (revision 797)
425 +++ src/gio/InetAddress.d (working copy)
426 @@ -205,7 +205,7 @@
427 * Since 2.22
428 * Returns: a representation of address as a string, which should befreed after use.
429 */
430 - public string toString()
431 + public override string toString()
432 {
433 // gchar * g_inet_address_to_string (GInetAddress *address);
434 return Str.toString(g_inet_address_to_string(gInetAddress));
435 Index: src/gio/UnixInputStream.d
436 ===================================================================
437 --- src/gio/UnixInputStream.d (revision 797)
438 +++ src/gio/UnixInputStream.d (working copy)
439 @@ -171,9 +171,11 @@
440 * Since 2.20
441 * Returns: The file descriptor of stream
442 */
443 + /+
444 public int getFd()
445 {
446 // gint g_unix_input_stream_get_fd (GUnixInputStream *stream);
447 return g_unix_input_stream_get_fd(gUnixInputStream);
448 }
449 + +/
450 }
451 Index: src/gio/UnixOutputStream.d
452 ===================================================================
453 --- src/gio/UnixOutputStream.d (revision 797)
454 +++ src/gio/UnixOutputStream.d (working copy)
455 @@ -171,9 +171,11 @@
456 * Since 2.20
457 * Returns: The file descriptor of stream
458 */
459 + /+
460 public int getFd()
461 {
462 // gint g_unix_output_stream_get_fd (GUnixOutputStream *stream);
463 return g_unix_output_stream_get_fd(gUnixOutputStream);
464 }
465 + +/
466 }
467 Index: demos/dsss.conf 452 Index: demos/dsss.conf
468 =================================================================== 453 ===================================================================
469 --- demos/dsss.conf (revision 797) 454 --- demos/dsss.conf (revision 802)
470 +++ demos/dsss.conf (working copy) 455 +++ demos/dsss.conf (working copy)
471 @@ -31,5 +31,6 @@ 456 @@ -31,5 +31,6 @@
472 #type = subdir 457 #type = subdir
473 458
474 #Please note that the gstreamer demos require Tango 459 #Please note that the gstreamer demos require Tango
476 [gstreamer] 461 [gstreamer]
477 type = subdir 462 type = subdir
478 \ No newline at end of file 463 \ No newline at end of file
479 Index: demos/gtkD/TestWindow/TestWindow.d 464 Index: demos/gtkD/TestWindow/TestWindow.d
480 =================================================================== 465 ===================================================================
481 --- demos/gtkD/TestWindow/TestWindow.d (revision 797) 466 --- demos/gtkD/TestWindow/TestWindow.d (revision 802)
482 +++ demos/gtkD/TestWindow/TestWindow.d (working copy) 467 +++ demos/gtkD/TestWindow/TestWindow.d (working copy)
483 @@ -948,7 +948,8 @@ 468 @@ -949,7 +949,8 @@
484 gdkThreadsLeave(); 469 gdkThreadsLeave();
485 yield(); 470 yield();
486 } 471 }
487 - return 1; 472 - return 1;
488 + //return 1; 473 + //return 1;