Mercurial > projects > doodle

comparison nobuild/gtkd-patches.diff @ 94:deb9d9fae854

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added my .hgrc file and tweaked README
author David Bryant <bagnose@gmail.com>
date Thu, 26 Aug 2010 16:08:21 +0930
parents excre/gtkd-patches.diff@100dd23c7bdf
children ab745d8b10e5
comparison
equal deleted inserted replaced
93:069ceb9446ad 94:deb9d9fae854
1 Index: src/gdkpixbuf/PixbufAnimation.d
2 ===================================================================
3 --- src/gdkpixbuf/PixbufAnimation.d (revision 797)
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 797)
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 797)
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 797)
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 797)
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 797)
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 797)
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 797)
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/RecentChooserMenu.d
255 ===================================================================
256 --- src/gtk/RecentChooserMenu.d (revision 797)
257 +++ src/gtk/RecentChooserMenu.d (working copy)
258 @@ -194,6 +194,7 @@
259 this(cast(GtkRecentChooserMenu*) p);
260 }
261
262 + /+
263 /**
264 * Returns the value set by gtk_recent_chooser_menu_set_show_numbers().
265 * Since 2.10
266 @@ -219,4 +220,5 @@
267 // void gtk_recent_chooser_menu_set_show_numbers (GtkRecentChooserMenu *menu, gboolean show_numbers);
268 gtk_recent_chooser_menu_set_show_numbers(gtkRecentChooserMenu, showNumbers);
269 }
270 + +/
271 }
272 Index: src/gtk/Toolbar.d
273 ===================================================================
274 --- src/gtk/Toolbar.d (revision 797)
275 +++ src/gtk/Toolbar.d (working copy)
276 @@ -437,6 +437,7 @@
277 gtk_toolbar_set_show_arrow(gtkToolbar, showArrow);
278 }
279
280 + /+
281 /**
282 * Warning
283 * 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.
284 @@ -449,6 +450,7 @@
285 // void gtk_toolbar_set_orientation (GtkToolbar *toolbar, GtkOrientation orientation);
286 gtk_toolbar_set_orientation(gtkToolbar, orientation);
287 }
288 + +/
289
290 /**
291 * Warning
292 @@ -486,6 +488,7 @@
293 return gtk_toolbar_get_show_arrow(gtkToolbar);
294 }
295
296 + /+
297 /**
298 * Warning
299 * 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.
300 @@ -498,6 +501,7 @@
301 // GtkOrientation gtk_toolbar_get_orientation (GtkToolbar *toolbar);
302 return gtk_toolbar_get_orientation(gtkToolbar);
303 }
304 + +/
305
306 /**
307 * Retrieves whether the toolbar has text, icons, or both . See
308 @@ -516,11 +520,13 @@
309 * Retrieves the icon size for the toolbar. See gtk_toolbar_set_icon_size().
310 * Returns: the current icon size for the icons onthe toolbar.. type int
311 */
312 + /+
313 public GtkIconSize getIconSize()
314 {
315 // GtkIconSize gtk_toolbar_get_icon_size (GtkToolbar *toolbar);
316 return gtk_toolbar_get_icon_size(gtkToolbar);
317 }
318 + +/
319
320 /**
321 * Warning
322 @@ -542,11 +548,13 @@
323 * Since 2.4
324 * Returns: The relief style of buttons on toolbar.
325 */
326 + /+
327 public GtkReliefStyle getReliefStyle()
328 {
329 // GtkReliefStyle gtk_toolbar_get_relief_style (GtkToolbar *toolbar);
330 return gtk_toolbar_get_relief_style(gtkToolbar);
331 }
332 + +/
333
334 /**
335 * Warning
336 Index: src/gtk/TreeViewColumn.d
337 ===================================================================
338 --- src/gtk/TreeViewColumn.d (revision 797)
339 +++ src/gtk/TreeViewColumn.d (working copy)
340 @@ -218,6 +218,7 @@
341 this(cast(GtkTreeViewColumn*) p);
342 }
343
344 + /+
345 /**
346 * Packs the cell into the beginning of the column. If expand is FALSE, then
347 * the cell is allocated no more space than it needs. Any unused space is divided
348 @@ -254,6 +255,7 @@
349 // void gtk_tree_view_column_clear (GtkTreeViewColumn *tree_column);
350 gtk_tree_view_column_clear(gtkTreeViewColumn);
351 }
352 + +/
353
354 /**
355 * Warning
356 @@ -273,6 +275,7 @@
357 return new ListG(cast(GList*) p);
358 }
359
360 + /+
361 /**
362 * Adds an attribute mapping to the list in tree_column. The column is the
363 * column of the model to get a value from, and the attribute is the
364 @@ -320,6 +323,7 @@
365 // void gtk_tree_view_column_clear_attributes (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell_renderer);
366 gtk_tree_view_column_clear_attributes(gtkTreeViewColumn, (cellRenderer is null) ? null : cellRenderer.getCellRendererStruct());
367 }
368 + +/
369
370 /**
371 * Sets the spacing field of tree_column, which is the number of pixels to
372 Index: src/cairo/Context.d
373 ===================================================================
374 --- src/cairo/Context.d (revision 797)
375 +++ src/cairo/Context.d (working copy)
376 @@ -152,6 +152,10 @@
377 // cairo_t* gdk_cairo_create (GdkDrawable *);
378 this(gdk_cairo_create(drawable.getDrawableStruct()));
379 }
380 +
381 + ~this () {
382 + cairo_destroy(cairo);
383 + }
384
385 /**
386 * Sets the specified GdkColor as the source color of cr.
387 Index: src/gio/InetAddress.d
388 ===================================================================
389 --- src/gio/InetAddress.d (revision 797)
390 +++ src/gio/InetAddress.d (working copy)
391 @@ -205,7 +205,7 @@
392 * Since 2.22
393 * Returns: a representation of address as a string, which should befreed after use.
394 */
395 - public string toString()
396 + public override string toString()
397 {
398 // gchar * g_inet_address_to_string (GInetAddress *address);
399 return Str.toString(g_inet_address_to_string(gInetAddress));
400 Index: src/gio/UnixInputStream.d
401 ===================================================================
402 --- src/gio/UnixInputStream.d (revision 797)
403 +++ src/gio/UnixInputStream.d (working copy)
404 @@ -171,9 +171,11 @@
405 * Since 2.20
406 * Returns: The file descriptor of stream
407 */
408 + /+
409 public int getFd()
410 {
411 // gint g_unix_input_stream_get_fd (GUnixInputStream *stream);
412 return g_unix_input_stream_get_fd(gUnixInputStream);
413 }
414 + +/
415 }
416 Index: src/gio/UnixOutputStream.d
417 ===================================================================
418 --- src/gio/UnixOutputStream.d (revision 797)
419 +++ src/gio/UnixOutputStream.d (working copy)
420 @@ -171,9 +171,11 @@
421 * Since 2.20
422 * Returns: The file descriptor of stream
423 */
424 + /+
425 public int getFd()
426 {
427 // gint g_unix_output_stream_get_fd (GUnixOutputStream *stream);
428 return g_unix_output_stream_get_fd(gUnixOutputStream);
429 }
430 + +/
431 }
432 Index: GNUmakefile
433 ===================================================================
434 --- GNUmakefile (revision 797)
435 +++ GNUmakefile (working copy)
436 @@ -1,6 +1,7 @@
437 #makeAll.sh
438 SHELL=/bin/sh
439 -prefix=/usr/local
440 +#prefix=/usr/local
441 +prefix=/home/daveb/source/d/dmd
442
443 OS=$(shell uname || uname -s)
444 ARCH=$(shell arch || uname -m)
445 @@ -19,7 +20,7 @@
446 endif
447
448 ifeq ("$(DC)","dmd")
449 - DCFLAGS=-O
450 + DCFLAGS=-O -wi
451 output=-of$@
452 else ifeq ("$(DC)","ldc")
453 DCFLAGS=-O
454 Index: demos/dsss.conf
455 ===================================================================
456 --- demos/dsss.conf (revision 797)
457 +++ demos/dsss.conf (working copy)
458 @@ -31,5 +31,6 @@
459 #type = subdir
460
461 #Please note that the gstreamer demos require Tango
462 +
463 [gstreamer]
464 type = subdir
465 \ No newline at end of file
466 Index: demos/gtkD/TestWindow/TestWindow.d
467 ===================================================================
468 --- demos/gtkD/TestWindow/TestWindow.d (revision 797)
469 +++ demos/gtkD/TestWindow/TestWindow.d (working copy)
470 @@ -948,7 +948,8 @@
471 gdkThreadsLeave();
472 yield();
473 }
474 - return 1;
475 + //return 1;
476 + assert(0);
477 }
478 }
479