summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2018-08-13 16:48:46 +0200
committerRico Tzschichholz <ricotz@ubuntu.com>2018-08-15 12:12:47 +0200
commit3f4c953591644f2024b540f2ed50bfd71ecf51aa (patch)
tree0cefcbb87e65351acec1bda26793cd0613042257
parent743287e62a0254f505c8907867475f3a5a2d9b98 (diff)
downloadvala-wip/gtk-gvalue.tar.gz
WIP gtk+-*.0: Fix some GLib.Value out/ref parameterswip/gtk-gvalue
This is required due to GLib.Value being bound as struct.
-rw-r--r--vapi/gobject-2.0.vapi4
-rw-r--r--vapi/gtk+-2.0.vapi6
-rw-r--r--vapi/gtk+-3.0.vapi16
-rw-r--r--vapi/gtk+-4.0.vapi8
-rw-r--r--vapi/metadata/Gtk-3.0.metadata19
-rw-r--r--vapi/metadata/Gtk-4.0.metadata7
-rw-r--r--vapi/packages/gtk+-2.0/gtk+-2.0.metadata6
7 files changed, 46 insertions, 20 deletions
diff --git a/vapi/gobject-2.0.vapi b/vapi/gobject-2.0.vapi
index 2b8c5ca60..a2e6c39aa 100644
--- a/vapi/gobject-2.0.vapi
+++ b/vapi/gobject-2.0.vapi
@@ -241,12 +241,12 @@ namespace GLib {
public void set_qdata (GLib.Quark quark, void* data);
public void set_qdata_full (GLib.Quark quark, void* data, GLib.DestroyNotify destroy);
[CCode (cname = "g_param_value_set_default")]
- public void set_value_default (GLib.Value value);
+ public void set_value_default (ref GLib.Value value);
public void sink ();
public void* steal_qdata (GLib.Quark quark);
public void unref ();
[CCode (cname = "g_param_value_convert")]
- public bool value_convert (GLib.Value src_value, GLib.Value dest_value, bool strict_validation);
+ public bool value_convert (GLib.Value src_value, ref GLib.Value dest_value, bool strict_validation);
[CCode (cname = "g_param_value_defaults", vfunc_name = "value_defaults")]
public virtual bool value_defaults (GLib.Value value);
[CCode (cname = "g_param_value_validate", vfunc_name = "value_validate")]
diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index 8b9679e0c..fa4302899 100644
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -1360,7 +1360,7 @@ namespace Gtk {
protected Container ();
public void add_with_properties (Gtk.Widget widget, ...);
public void child_get (Gtk.Widget child, ...);
- public void child_get_property (Gtk.Widget child, string property_name, GLib.Value value);
+ public void child_get_property (Gtk.Widget child, string property_name, ref GLib.Value value);
public void child_get_valist (Gtk.Widget child, string first_property_name, va_list var_args);
public void child_set (Gtk.Widget child, ...);
public void child_set_property (Gtk.Widget child, string property_name, GLib.Value value);
@@ -1376,7 +1376,7 @@ namespace Gtk {
public void @foreach (Gtk.Callback callback);
public uint get_border_width ();
[NoWrapper]
- public virtual void get_child_property (Gtk.Widget child, uint property_id, GLib.Value value, GLib.ParamSpec pspec);
+ public virtual void get_child_property (Gtk.Widget child, uint property_id, ref GLib.Value value, GLib.ParamSpec pspec);
public GLib.List<weak Gtk.Widget> get_children ();
public bool get_focus_chain (out GLib.List<weak Gtk.Widget> focusable_widgets);
public unowned Gtk.Widget get_focus_child ();
@@ -4245,7 +4245,7 @@ namespace Gtk {
[NoWrapper]
public virtual void draw_vline (Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int y1_, int y2_, int x);
public void @get (GLib.Type widget_type, ...);
- public void get_style_property (GLib.Type widget_type, string property_name, out GLib.Value value);
+ public void get_style_property (GLib.Type widget_type, string property_name, ref GLib.Value value);
public void get_valist (GLib.Type widget_type, string first_property_name, void* var_args);
[NoWrapper]
public virtual void init_from_rc (Gtk.RcStyle rc_style);
diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 774d9274d..22137f60e 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -1384,7 +1384,7 @@ namespace Gtk {
[Version (since = "3.0")]
public void cell_get (Gtk.CellRenderer renderer, ...);
[Version (since = "3.0")]
- public void cell_get_property (Gtk.CellRenderer renderer, string property_name, GLib.Value value);
+ public void cell_get_property (Gtk.CellRenderer renderer, string property_name, ref GLib.Value value);
[Version (since = "3.0")]
public void cell_get_valist (Gtk.CellRenderer renderer, string first_property_name, [CCode (type = "va_list")] va_list var_args);
[Version (since = "3.0")]
@@ -1413,7 +1413,7 @@ namespace Gtk {
[Version (since = "3.0")]
public unowned Gtk.CellRenderer get_cell_at_position (Gtk.CellAreaContext context, Gtk.Widget widget, Gdk.Rectangle cell_area, int x, int y, out Gdk.Rectangle alloc_area);
[NoWrapper]
- public virtual void get_cell_property (Gtk.CellRenderer renderer, uint property_id, GLib.Value value, GLib.ParamSpec pspec);
+ public virtual void get_cell_property (Gtk.CellRenderer renderer, uint property_id, ref GLib.Value value, GLib.ParamSpec pspec);
[Version (since = "3.0")]
public unowned string get_current_path_string ();
[Version (since = "3.0")]
@@ -2322,7 +2322,7 @@ namespace Gtk {
protected Container ();
public void add_with_properties (Gtk.Widget widget, ...);
public void child_get (Gtk.Widget child, ...);
- public void child_get_property (Gtk.Widget child, string property_name, GLib.Value value);
+ public void child_get_property (Gtk.Widget child, string property_name, ref GLib.Value value);
public void child_get_valist (Gtk.Widget child, string first_property_name, [CCode (type = "va_list")] va_list var_args);
[Version (since = "3.2")]
public void child_notify (Gtk.Widget child, string child_property);
@@ -2347,7 +2347,7 @@ namespace Gtk {
public void @foreach (Gtk.Callback callback);
public uint get_border_width ();
[NoWrapper]
- public virtual void get_child_property (Gtk.Widget child, uint property_id, GLib.Value value, GLib.ParamSpec pspec);
+ public virtual void get_child_property (Gtk.Widget child, uint property_id, ref GLib.Value value, GLib.ParamSpec pspec);
public GLib.List<weak Gtk.Widget> get_children ();
[Version (deprecated = true, deprecated_since = "3.24")]
public bool get_focus_chain (out GLib.List<weak Gtk.Widget> focusable_widgets);
@@ -7498,7 +7498,7 @@ namespace Gtk {
[Version (since = "2.16")]
public void @get (GLib.Type widget_type, ...);
[Version (since = "2.16")]
- public void get_style_property (GLib.Type widget_type, string property_name, out GLib.Value value);
+ public void get_style_property (GLib.Type widget_type, string property_name, ref GLib.Value value);
[Version (since = "2.16")]
public void get_valist (GLib.Type widget_type, string first_property_name, [CCode (type = "va_list")] va_list var_args);
[Version (since = "3.0")]
@@ -7567,7 +7567,7 @@ namespace Gtk {
public Gtk.StateFlags get_state ();
[Version (since = "3.0")]
public void get_style (...);
- public void get_style_property (string property_name, GLib.Value value);
+ public void get_style_property (string property_name, ref GLib.Value value);
[Version (since = "3.0")]
public void get_style_valist ([CCode (type = "va_list")] va_list args);
[Version (since = "3.0")]
@@ -8408,7 +8408,7 @@ namespace Gtk {
[Version (deprecated = true, deprecated_since = "3.14", since = "3.0")]
public void get_style (...);
[Version (deprecated = true, deprecated_since = "3.14", since = "3.0")]
- public GLib.Value get_style_property (string property_name);
+ public void get_style_property (string property_name, ref GLib.Value value);
[Version (deprecated = true, deprecated_since = "3.14", since = "3.0")]
public void get_style_valist ([CCode (type = "va_list")] va_list args);
[Version (deprecated = true, deprecated_since = "3.14", since = "3.0")]
@@ -10839,7 +10839,7 @@ namespace Gtk {
[Version (deprecated = true, deprecated_since = "3.8", since = "3.0")]
public abstract Gtk.StyleProperties? get_style (Gtk.WidgetPath path);
[Version (since = "3.0")]
- public abstract bool get_style_property (Gtk.WidgetPath path, Gtk.StateFlags state, GLib.ParamSpec pspec, out GLib.Value value);
+ public abstract bool get_style_property (Gtk.WidgetPath path, Gtk.StateFlags state, GLib.ParamSpec pspec, ref GLib.Value value);
}
[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_tool_shell_get_type ()")]
public interface ToolShell : Gtk.Widget {
diff --git a/vapi/gtk+-4.0.vapi b/vapi/gtk+-4.0.vapi
index 71e84f18f..8c2405eab 100644
--- a/vapi/gtk+-4.0.vapi
+++ b/vapi/gtk+-4.0.vapi
@@ -6879,7 +6879,7 @@ namespace Gtk {
public void attribute_disconnect (Gtk.CellRenderer renderer, string attribute);
public int attribute_get_column (Gtk.CellRenderer renderer, string attribute);
public void cell_get (Gtk.CellRenderer renderer, ...);
- public void cell_get_property (Gtk.CellRenderer renderer, string property_name, GLib.Value value);
+ public void cell_get_property (Gtk.CellRenderer renderer, string property_name, ref GLib.Value value);
public void cell_get_valist (Gtk.CellRenderer renderer, string first_property_name, [CCode (type = "va_list")] va_list var_args);
public void cell_set (Gtk.CellRenderer renderer, ...);
public void cell_set_property (Gtk.CellRenderer renderer, string property_name, GLib.Value value);
@@ -6895,7 +6895,7 @@ namespace Gtk {
public Gdk.Rectangle get_cell_allocation (Gtk.CellAreaContext context, Gtk.Widget widget, Gtk.CellRenderer renderer, Gdk.Rectangle cell_area);
public unowned Gtk.CellRenderer get_cell_at_position (Gtk.CellAreaContext context, Gtk.Widget widget, Gdk.Rectangle cell_area, int x, int y, out Gdk.Rectangle alloc_area);
[NoWrapper]
- public virtual void get_cell_property (Gtk.CellRenderer renderer, uint property_id, GLib.Value value, GLib.ParamSpec pspec);
+ public virtual void get_cell_property (Gtk.CellRenderer renderer, uint property_id, ref GLib.Value value, GLib.ParamSpec pspec);
public unowned string get_current_path_string ();
public unowned Gtk.CellEditable get_edit_widget ();
public unowned Gtk.CellRenderer get_edited_cell ();
@@ -7432,7 +7432,7 @@ namespace Gtk {
protected Container ();
public void add_with_properties (Gtk.Widget widget, ...);
public void child_get (Gtk.Widget child, ...);
- public void child_get_property (Gtk.Widget child, string property_name, GLib.Value value);
+ public void child_get_property (Gtk.Widget child, string property_name, ref GLib.Value value);
public void child_get_valist (Gtk.Widget child, string first_property_name, [CCode (type = "va_list")] va_list var_args);
public void child_notify (Gtk.Widget child, string child_property);
public void child_notify_by_pspec (Gtk.Widget child, GLib.ParamSpec pspec);
@@ -7445,7 +7445,7 @@ namespace Gtk {
public virtual void forall (Gtk.Callback callback);
public void @foreach (Gtk.Callback callback);
[NoWrapper]
- public virtual void get_child_property (Gtk.Widget child, uint property_id, GLib.Value value, GLib.ParamSpec pspec);
+ public virtual void get_child_property (Gtk.Widget child, uint property_id, ref GLib.Value value, GLib.ParamSpec pspec);
public GLib.List<weak Gtk.Widget> get_children ();
public unowned Gtk.Adjustment? get_focus_hadjustment ();
public unowned Gtk.Adjustment? get_focus_vadjustment ();
diff --git a/vapi/metadata/Gtk-3.0.metadata b/vapi/metadata/Gtk-3.0.metadata
index d06320656..7fb235c10 100644
--- a/vapi/metadata/Gtk-3.0.metadata
+++ b/vapi/metadata/Gtk-3.0.metadata
@@ -424,6 +424,23 @@ RcProperty skip
// Vala-specific, not really bugs
/////////////////////////////////
+CellArea
+ .cell_get_property.value ref
+ .get_cell_property.value ref
+Container
+ .get_child_property.value ref
+ .child_get_property.value ref
+Style
+ .get_style_property.value ref
+StyleContext
+ .get_style_property.value ref
+StyleProvider
+ .get_style_property.value ref
+ThemingEngine
+ .get_style_property.value ref
+Widget
+ .style_get_property.value ref
+
// Keep properties non-abstract as before
*#interface.*#property abstract=false
@@ -497,7 +514,6 @@ Style
.text unowned=false
.text_aa unowned=false
.copy skip
- .get_style_property return_void
render_* parent="Gtk.StyleContext"
render_* symbol_type="method" instance_idx=0
render_icon_pixbuf.size type="Gtk.IconSize"
@@ -557,7 +573,6 @@ Widget
.new skip
.render_icon*.size type="Gtk.IconSize"
.set_parent.parent type="Gtk.Container"
- .style_get_property.value ref
.touch_event.event type="Gdk.EventTouch"
.window skip
WidgetPath
diff --git a/vapi/metadata/Gtk-4.0.metadata b/vapi/metadata/Gtk-4.0.metadata
index a72140780..890028646 100644
--- a/vapi/metadata/Gtk-4.0.metadata
+++ b/vapi/metadata/Gtk-4.0.metadata
@@ -264,6 +264,13 @@ TreeModel
// Vala-specific, not really bugs
/////////////////////////////////
+CellArea
+ .cell_get_property.value ref
+ .get_cell_property.value ref
+Container
+ .get_child_property.value ref
+ .child_get_property.value ref
+
// Backwards compatibility
AccelGroup
.find type="Gtk.AccelKey*"
diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index 3a82a1528..c27384f7e 100644
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -117,6 +117,8 @@ gtk_calendar_set_detail_func.destroy hidden="1"
GtkCalendarDetailFunc transfer_ownership="1"
GtkCallbackMarshal hidden="1"
GtkCell.u hidden="1"
+gtk_cell_area_cell_get_property.value is_ref="1"
+gtk_cell_area_get_cell_property.value is_ref="1"
GtkCellEditable::editing_done has_emitter="1"
GtkCellEditable::remove_widget has_emitter="1"
gtk_cell_editable_start_editing.event nullable="1"
@@ -194,12 +196,14 @@ GtkContainer::composite_name transfer_ownership="1"
GtkContainer::remove has_emitter="1"
GtkContainer::set_focus_child has_emitter="1"
GtkContainer::set_focus_child.widget nullable="1"
+gtk_container_child_get_property.value is_ref="1"
gtk_container_child_get_valist.var_args type_name="va_list"
gtk_container_child_set_valist.var_args type_name="va_list"
gtk_container_forall virtual="0"
gtk_container_forall.callback_data hidden="1"
gtk_container_foreach.callback_data hidden="1"
gtk_container_get_children transfer_ownership="1" type_arguments="unowned Widget"
+gtk_container_get_child_property.value is_ref="1"
gtk_container_get_focus_chain.focusable_widgets is_out="1" takes_ownership="1" type_arguments="unowned Widget"
gtk_container_set_focus_chain.focusable_widgets type_arguments="Widget"
GtkContainerClass name="pointer"
@@ -725,7 +729,7 @@ GtkStyle.bg_pixmap weak="0"
gtk_style_clone transfer_ownership="1"
gtk_style_copy virtual="0" type_name="Style" transfer_ownership="1"
gtk_style_lookup_color.color is_out="1"
-gtk_style_get_style_property.value is_out="1"
+gtk_style_get_style_property.value is_ref="1"
gtk_table_get_size.rows is_out="1"
gtk_table_get_size.columns is_out="1"
GtkTable.children type_arguments="TableChild"