ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Gtk 3.18.2

Browse source 
Had to change gapi2xml.pl to use the new properties method/macro in gtkwindow.c
- Issue, "invisible-chars" and "inner-border" is generated twice in gtkentry.c

Made patch to gwin32registrykey to use little endian by default. So Windows om ARM may fail.
This commit is contained in:
Mikkel Kruse Johnsen 2015-11-10 11:37:34 +01:00
parent 62b9345c7f
commit a8d9a119d8
18 changed files with 1234 additions and 575 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cairo/FontOptions.cs
View file

@ -43,7 +43,7 @@ namespace Cairo
Dispose (false);
}
internal FontOptions (IntPtr handle)
public FontOptions (IntPtr handle)
{
if (handle == IntPtr.Zero)
throw new ArgumentException ("handle should not be NULL", "handle");

6
configure.ac
View file

@ -1,5 +1,5 @@
AC_INIT(gtk-sharp, 3.14.0)
AC_INIT(gtk-sharp, 3.18.2)
AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 tar-ustar foreign])
AC_CANONICAL_HOST
@ -7,14 +7,14 @@ AC_CONFIG_HEADERS(config.h)
AM_MAINTAINER_MODE
AC_CONFIG_MACRO_DIR([m4])
API_VERSION=3.14.0.0
API_VERSION=3.18.0.0
AC_SUBST(API_VERSION)
CAIRO_API_VERSION=1.12.0.0
AC_SUBST(CAIRO_API_VERSION)
POLICY_VERSIONS=""
AC_SUBST(POLICY_VERSIONS)
PACKAGE_VERSION=gtk-sharp-3.14
PACKAGE_VERSION=gtk-sharp-3.18
AC_SUBST(PACKAGE_VERSION)
WIN64DEFINES=

1
gdk/Makefile.am
View file

@ -43,6 +43,7 @@ sources = \
Point.cs \
Property.cs \
Rectangle.cs \
RGBA.cs \
Screen.cs \
Selection.cs \
Size.cs \

5
gdk/Pixbuf.cs
View file

@ -165,12 +165,15 @@ namespace Gdk {
public Pixbuf(byte [] data, Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height, int rowstride) : this (data, colorspace, has_alpha, bits_per_sample, width, height, rowstride, null) {}
/* gdk_pixbuf_new_from_inline has been deprecated since version 2.32 and should not be used in newly-written code. Use GResource instead */
/*
public unsafe Pixbuf(byte[] data, bool copy_pixels) : base (IntPtr.Zero)
{
IntPtr error = IntPtr.Zero;
Raw = gdk_pixbuf_new_from_inline(data.Length, data, copy_pixels, out error);
Raw = gdk_pixbuf_new_from_inline(data.Length, (IntPtr) data, copy_pixels, out error);
if (error != IntPtr.Zero) throw new GLib.GException (error);
}
*/
[DllImport ("libgdk_pixbuf-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern unsafe IntPtr gdk_pixbuf_new_from_inline(int len, IntPtr data, bool copy_pixels, out IntPtr error);

24
gdk/RGBA.cs Normal file
View file

@ -0,0 +1,24 @@
namespace Gdk {
using System;
using System.Collections;
using System.Collections.Generic;
using System.Runtime.InteropServices;
public partial struct RGBA {
public static explicit operator GLib.Value (Gdk.RGBA boxed)
{
GLib.Value val = GLib.Value.Empty;
val.Init (Gdk.RGBA.GType);
val.Val = boxed;
return val;
}
public static explicit operator Gdk.RGBA (GLib.Value val)
{
return (Gdk.RGBA) val.Val;
}
}
}

198
gdk/gdk-api.raw
View file

@ -161,6 +161,7 @@
<member cname="GDK_SCROLL_MASK" name="ScrollMask" value="1 &lt;&lt; 21" />
<member cname="GDK_TOUCH_MASK" name="TouchMask" value="1 &lt;&lt; 22" />
<member cname="GDK_SMOOTH_SCROLL_MASK" name="SmoothScrollMask" value="1 &lt;&lt; 23" />
<member cname="GDK_TOUCHPAD_GESTURE_MASK" name="TouchpadGestureMask" value="1 &lt;&lt; 24" />
<member cname="GDK_ALL_EVENTS_MASK" name="AllEventsMask" value="0xFFFFFE" />
</enum>
<enum name="EventType" cname="GdkEventType" gtype="gdk_event_type_get_type" type="enum">
@ -207,6 +208,8 @@
<member cname="GDK_TOUCH_UPDATE" name="TouchUpdate" value="38" />
<member cname="GDK_TOUCH_END" name="TouchEnd" value="39" />
<member cname="GDK_TOUCH_CANCEL" name="TouchCancel" value="40" />
<member cname="GDK_TOUCHPAD_SWIPE" name="TouchpadSwipe" value="41" />
<member cname="GDK_TOUCHPAD_PINCH" name="TouchpadPinch" value="42" />
<member cname="GDK_EVENT_LAST" name="EventLast" />
</enum>
<enum name="FilterReturn" cname="GdkFilterReturn" gtype="gdk_filter_return_get_type" type="enum">
@ -279,6 +282,7 @@
<member cname="GDK_MODIFIER_INTENT_MODIFY_SELECTION" name="ModifySelection" />
<member cname="GDK_MODIFIER_INTENT_NO_TEXT_INPUT" name="NoTextInput" />
<member cname="GDK_MODIFIER_INTENT_SHIFT_GROUP" name="ShiftGroup" />
<member cname="GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK" name="DefaultModMask" />
</enum>
<enum name="ModifierType" cname="GdkModifierType" gtype="gdk_modifier_type_get_type" type="flags">
<member cname="GDK_SHIFT_MASK" name="ShiftMask" value="1 &lt;&lt; 0" />
@ -355,6 +359,12 @@
<member cname="GDK_ERROR_FILE" name="ErrorFile" value="-3" />
<member cname="GDK_ERROR_MEM" name="ErrorMem" value="-4" />
</enum>
<enum name="TouchpadGesturePhase" cname="GdkTouchpadGesturePhase" gtype="gdk_touchpad_gesture_phase_get_type" type="enum">
<member cname="GDK_TOUCHPAD_GESTURE_PHASE_BEGIN" name="Begin" />
<member cname="GDK_TOUCHPAD_GESTURE_PHASE_UPDATE" name="Update" />
<member cname="GDK_TOUCHPAD_GESTURE_PHASE_END" name="End" />
<member cname="GDK_TOUCHPAD_GESTURE_PHASE_CANCEL" name="Cancel" />
</enum>
<enum name="VisibilityState" cname="GdkVisibilityState" gtype="gdk_visibility_state_get_type" type="enum">
<member cname="GDK_VISIBILITY_UNOBSCURED" name="Unobscured" />
<member cname="GDK_VISIBILITY_PARTIAL" name="Partial" />
@ -1701,6 +1711,8 @@
<method vm="end_frame" />
<method vm="texture_from_surface" />
</class_struct>
<property name="Display" cname="display" type="GdkDisplay" readable="true" writeable="true" construct-only="true" />
<property name="Window" cname="window" type="GdkWindow" readable="true" writeable="true" construct-only="true" />
<property name="SharedContext" cname="shared-context" type="GdkGlContext" readable="true" writeable="true" construct-only="true" />
<virtual_method name="Realize" cname="realize">
<return-type type="gboolean" />
@ -1796,6 +1808,7 @@
<method vm="have_bidi_layouts" />
<method vm="get_caps_lock_state" />
<method vm="get_num_lock_state" />
<method vm="get_scroll_lock_state" />
<method vm="get_entries_for_keyval" />
<method vm="get_entries_for_keycode" />
<method vm="lookup_key" />
@ -1836,6 +1849,10 @@
<return-type type="gboolean" />
<parameters />
</virtual_method>
<virtual_method name="GetScrollLockState" cname="get_scroll_lock_state">
<return-type type="gboolean" />
<parameters />
</virtual_method>
<virtual_method name="GetEntriesForKeyval" cname="get_entries_for_keyval">
<return-type type="gboolean" />
<parameters>
@ -1943,6 +1960,9 @@
<method name="GetNumLockState" cname="gdk_keymap_get_num_lock_state">
<return-type type="gboolean" />
</method>
<method name="GetScrollLockState" cname="gdk_keymap_get_scroll_lock_state">
<return-type type="gboolean" />
</method>
<method name="GetType" cname="gdk_keymap_get_type" shared="true">
<return-type type="GType" />
</method>
@ -2009,24 +2029,10 @@
<method vm="query_depths" />
<method vm="query_visual_types" />
<method vm="get_monitor_scale_factor" />
<method signal_vm="size_changed" />
<method signal_vm="composited_changed" />
<method signal_vm="monitors_changed" />
<method vm="size_changed" />
<method vm="composited_changed" />
<method vm="monitors_changed" />
</class_struct>
<property name="FontOptions" cname="font-options" type="gpointer" readable="true" writeable="true" />
<property name="Resolution" cname="resolution" type="gdouble" readable="true" writeable="true" />
<signal name="SizeChanged" cname="size-changed" when="LAST" field_name="size_changed">
<return-type type="void" />
<parameters />
</signal>
<signal name="CompositedChanged" cname="composited-changed" when="LAST" field_name="composited_changed">
<return-type type="void" />
<parameters />
</signal>
<signal name="MonitorsChanged" cname="monitors-changed" when="LAST" field_name="monitors_changed">
<return-type type="void" />
<parameters />
</signal>
<virtual_method name="GetDisplay" cname="get_display">
<return-type type="GdkDisplay*" />
<parameters />
@ -2187,6 +2193,18 @@
<parameter type="gint" name="monitor_num" />
</parameters>
</virtual_method>
<virtual_method name="SizeChanged" cname="size_changed">
<return-type type="void" />
<parameters />
</virtual_method>
<virtual_method name="CompositedChanged" cname="composited_changed">
<return-type type="void" />
<parameters />
</virtual_method>
<virtual_method name="MonitorsChanged" cname="monitors_changed">
<return-type type="void" />
<parameters />
</virtual_method>
<method name="GetActiveWindow" cname="gdk_screen_get_active_window">
<return-type type="GdkWindow*" />
</method>
@ -2644,6 +2662,12 @@
<method name="Fullscreen" cname="gdk_window_fullscreen">
<return-type type="void" />
</method>
<method name="FullscreenOnMonitor" cname="gdk_window_fullscreen_on_monitor">
<return-type type="void" />
<parameters>
<parameter type="gint" name="monitor" />
</parameters>
</method>
<method name="GeometryChanged" cname="gdk_window_geometry_changed">
<return-type type="void" />
</method>
@ -2771,6 +2795,9 @@
<method name="GetParent" cname="gdk_window_get_parent">
<return-type type="GdkWindow*" />
</method>
<method name="GetPassThrough" cname="gdk_window_get_pass_through">
<return-type type="gboolean" />
</method>
<method name="GetPointer" cname="gdk_window_get_pointer" deprecated="1">
<return-type type="GdkWindow*" />
<parameters>
@ -3172,6 +3199,12 @@
<parameter type="gboolean" name="override_redirect" />
</parameters>
</method>
<method name="SetPassThrough" cname="gdk_window_set_pass_through">
<return-type type="void" />
<parameters>
<parameter type="gboolean" name="pass_through" />
</parameters>
</method>
<method name="SetRole" cname="gdk_window_set_role">
<return-type type="void" />
<parameters>
@ -3516,6 +3549,38 @@
<field name="XRoot" cname="x_root" type="gdouble" />
<field name="YRoot" cname="y_root" type="gdouble" />
</struct>
<struct name="EventTouchpadPinch" cname="GdkEventTouchpadPinch">
<field name="Type" cname="type" type="GdkEventType" />
<field name="Window" cname="window" type="GdkWindow*" />
<field name="SendEvent" cname="send_event" type="gint8" />
<field name="Phase" cname="phase" type="gint8" />
<field name="NFingers" cname="n_fingers" type="gint8" />
<field name="Time" cname="time" type="guint32" />
<field name="X" cname="x" type="gdouble" />
<field name="Y" cname="y" type="gdouble" />
<field name="Dx" cname="dx" type="gdouble" />
<field name="Dy" cname="dy" type="gdouble" />
<field name="AngleDelta" cname="angle_delta" type="gdouble" />
<field name="Scale" cname="scale" type="gdouble" />
<field name="XRoot" cname="x_root" type="gdouble" />
<field name="YRoot" cname="y_root" type="gdouble" />
<field name="State" cname="state" type="guint" />
</struct>
<struct name="EventTouchpadSwipe" cname="GdkEventTouchpadSwipe">
<field name="Type" cname="type" type="GdkEventType" />
<field name="Window" cname="window" type="GdkWindow*" />
<field name="SendEvent" cname="send_event" type="gint8" />
<field name="Phase" cname="phase" type="gint8" />
<field name="NFingers" cname="n_fingers" type="gint8" />
<field name="Time" cname="time" type="guint32" />
<field name="X" cname="x" type="gdouble" />
<field name="Y" cname="y" type="gdouble" />
<field name="Dx" cname="dx" type="gdouble" />
<field name="Dy" cname="dy" type="gdouble" />
<field name="XRoot" cname="x_root" type="gdouble" />
<field name="YRoot" cname="y_root" type="gdouble" />
<field name="State" cname="state" type="guint" />
</struct>
<struct name="EventVisibility" cname="GdkEventVisibility">
<field name="Type" cname="type" type="GdkEventType" />
<field name="Window" cname="window" type="GdkWindow*" />
@ -3605,7 +3670,7 @@
<field name="Y" cname="y" type="gint" />
</struct>
<struct name="Predicate" cname="GdkPredicate" opaque="true" />
<boxed name="RGBA" cname="GdkRGBA">
<struct name="RGBA" cname="GdkRGBA">
<field name="Red" cname="red" type="gdouble" />
<field name="Green" cname="green" type="gdouble" />
<field name="Blue" cname="blue" type="gdouble" />
@ -3641,7 +3706,7 @@
<method name="ToString" cname="gdk_rgba_to_string">
<return-type type="gchar*" />
</method>
</boxed>
</struct>
<alias name="Rectangle" cname="GdkRectangle" type="cairo_rectangle_int_t" />
<struct name="ThreadsDispatch" cname="GdkThreadsDispatch" opaque="true" />
<struct name="TimeCoord" cname="GdkTimeCoord">
@ -4596,7 +4661,7 @@
<member cname="GDK_PIXBUF_ROTATE_UPSIDEDOWN" name="Upsidedown" value="180" />
<member cname="GDK_PIXBUF_ROTATE_CLOCKWISE" name="Clockwise" value="270" />
</enum>
<enum name="PixdataDumpType" cname="GdkPixdataDumpType" type="flags">
<enum name="PixdataDumpType" cname="GdkPixdataDumpType" deprecated="1" type="flags">
<member cname="GDK_PIXDATA_DUMP_PIXDATA_STREAM" name="PixdataStream" />
<member cname="GDK_PIXDATA_DUMP_PIXDATA_STRUCT" name="PixdataStruct" value="1" />
<member cname="GDK_PIXDATA_DUMP_MACROS" name="Macros" value="2" />
@ -4606,7 +4671,7 @@
<member cname="GDK_PIXDATA_DUMP_CONST" name="Const" value="1 &lt;&lt; 10" />
<member cname="GDK_PIXDATA_DUMP_RLE_DECODER" name="RleDecoder" value="1 &lt;&lt; 16" />
</enum>
<enum name="PixdataType" cname="GdkPixdataType" type="flags">
<enum name="PixdataType" cname="GdkPixdataType" deprecated="1" type="flags">
<member cname="GDK_PIXDATA_COLOR_TYPE_RGB" name="ColorTypeRgb" value="0x01" />
<member cname="GDK_PIXDATA_COLOR_TYPE_RGBA" name="ColorTypeRgba" value="0x02" />
<member cname="GDK_PIXDATA_COLOR_TYPE_MASK" name="ColorTypeMask" value="0xff" />
@ -4644,6 +4709,7 @@
<property name="Height" cname="height" type="gint" />
<property name="Rowstride" cname="rowstride" type="gint" />
<property name="Pixels" cname="pixels" type="gpointer" />
<property name="PixelBytes" cname="pixel-bytes" type="GBytes" />
<implements>
<interface cname="GIcon" />
<interface cname="GLoadableIcon" />
@ -4739,14 +4805,6 @@
<parameter type="gboolean" name="horizontal" />
</parameters>
</method>
<method name="FromPixdata" cname="gdk_pixbuf_from_pixdata" shared="true">
<return-type type="GdkPixbuf*" />
<parameters>
<parameter type="const-GdkPixdata*" name="pixdata" />
<parameter type="gboolean" name="copy_pixels" />
<parameter type="GError**" name="error" />
</parameters>
</method>
<method name="GetBitsPerSample" cname="gdk_pixbuf_get_bits_per_sample">
<return-type type="int" />
</method>
@ -4764,6 +4822,24 @@
<parameter type="gint*" name="height" />
</parameters>
</method>
<method name="GetFileInfoAsync" cname="gdk_pixbuf_get_file_info_async" shared="true">
<return-type type="void" />
<parameters>
<parameter type="const-gchar*" name="filename" />
<parameter type="GCancellable*" name="cancellable" />
<parameter type="GAsyncReadyCallback" name="callback" />
<parameter type="gpointer" name="user_data" />
</parameters>
</method>
<method name="GetFileInfoFinish" cname="gdk_pixbuf_get_file_info_finish" shared="true">
<return-type type="GdkPixbufFormat*" />
<parameters>
<parameter type="GAsyncResult*" name="async_result" />
<parameter type="gint*" name="width" />
<parameter type="gint*" name="height" />
<parameter type="GError**" name="error" />
</parameters>
</method>
<method name="GetFormats" cname="gdk_pixbuf_get_formats" shared="true">
<return-type type="GSList*" />
</method>
@ -4782,6 +4858,9 @@
<parameter type="const-gchar*" name="key" />
</parameters>
</method>
<method name="GetOptions" cname="gdk_pixbuf_get_options">
<return-type type="GHashTable*" />
</method>
<method name="GetPixels" cname="gdk_pixbuf_get_pixels">
<return-type type="guchar*" />
</method>
@ -4800,12 +4879,6 @@
<method name="GetWidth" cname="gdk_pixbuf_get_width">
<return-type type="int" />
</method>
<method name="Gettext" cname="gdk_pixbuf_gettext" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="const-gchar*" name="msgid)" />
</parameters>
</method>
<constructor cname="gdk_pixbuf_new">
<parameters>
<parameter type="GdkColorspace" name="colorspace" />
@ -4815,6 +4888,17 @@
<parameter type="int" name="height" />
</parameters>
</constructor>
<constructor cname="gdk_pixbuf_new_from_bytes">
<parameters>
<parameter type="GBytes*" name="data" />
<parameter type="GdkColorspace" name="colorspace" />
<parameter type="gboolean" name="has_alpha" />
<parameter type="int" name="bits_per_sample" />
<parameter type="int" name="width" />
<parameter type="int" name="height" />
<parameter type="int" name="rowstride" />
</parameters>
</constructor>
<constructor cname="gdk_pixbuf_new_from_data">
<parameters>
<parameter type="const-guchar*" name="data" />
@ -4851,14 +4935,6 @@
<parameter type="GError**" name="error" />
</parameters>
</constructor>
<constructor cname="gdk_pixbuf_new_from_inline">
<parameters>
<parameter type="gint" name="data_length" />
<parameter type="const-guint8*" name="data" />
<parameter type="gboolean" name="copy_pixels" />
<parameter type="GError**" name="error" />
</parameters>
</constructor>
<constructor cname="gdk_pixbuf_new_from_resource">
<parameters>
<parameter type="const-char*" name="resource_path" />
@ -4930,6 +5006,12 @@
<parameter type="int" name="height" />
</parameters>
</constructor>
<method name="ReadPixelBytes" cname="gdk_pixbuf_read_pixel_bytes">
<return-type type="GBytes*" />
</method>
<method name="ReadPixels" cname="gdk_pixbuf_read_pixels">
<return-type type="const-guint8*" />
</method>
<method name="RotateSimple" cname="gdk_pixbuf_rotate_simple">
<return-type type="GdkPixbuf*" />
<parameters>
@ -5385,7 +5467,7 @@
</method>
</struct>
<struct name="PixbufSimpleAnimIterClass" cname="GdkPixbufSimpleAnimIterClass" opaque="true" />
<struct name="Pixdata" cname="GdkPixdata">
<struct name="Pixdata" cname="GdkPixdata" deprecated="1">
<field name="Magic" cname="magic" type="guint32" />
<field name="Length" cname="length" type="gint32" />
<field name="PixdataType" cname="pixdata_type" type="guint32" />
@ -5393,34 +5475,6 @@
<field name="Width" cname="width" type="guint32" />
<field name="Height" cname="height" type="guint32" />
<field name="PixelData" cname="pixel_data" type="guint8*" />
<method name="Deserialize" cname="gdk_pixdata_deserialize">
<return-type type="gboolean" />
<parameters>
<parameter type="guint" name="stream_length" />
<parameter type="const-guint8*" name="stream" />
<parameter type="GError**" name="error" />
</parameters>
</method>
<method name="FromPixbuf" cname="gdk_pixdata_from_pixbuf">
<return-type type="gpointer" />
<parameters>
<parameter type="const-GdkPixbuf*" name="pixbuf" />
<parameter type="gboolean" name="use_rle" />
</parameters>
</method>
<method name="Serialize" cname="gdk_pixdata_serialize">
<return-type type="guint8*" />
<parameters>
<parameter type="guint*" name="stream_length_p" />
</parameters>
</method>
<method name="ToCsource" cname="gdk_pixdata_to_csource">
<return-type type="GString*" />
<parameters>
<parameter type="const-gchar*" name="name" />
<parameter type="GdkPixdataDumpType" name="dump_type" />
</parameters>
</method>
</struct>
<struct name="Gif89" cname="Gif89" opaque="true" />
<struct name="GifContext" cname="GifContext" opaque="true" />

2
generator/StructField.cs
View file

@ -88,7 +88,7 @@ namespace GtkSharp.Generation {
IGeneratable gen = table [CType];
if (IsArray || gen is IAccessor)
return StudlyName;
return Access == "public" ? StudlyName : Name;
else if (IsBitfield)
return Name;
else if (IsPointer && (gen is StructGen || gen is BoxedGen || gen is UnionGen))

421
gio/gio-api.raw
View file

@ -66,6 +66,7 @@
<enum name="DBusCallFlags" cname="GDBusCallFlags" type="flags">
<member cname="G_DBUS_CALL_FLAGS_NONE" name="None" />
<member cname="G_DBUS_CALL_FLAGS_NO_AUTO_START" name="NoAutoStart" value="1 &lt;&lt; 0" />
<member cname="G_DBUS_CALL_FLAGS_ALLOW_INTERACTIVE_AUTHORIZATION" name="AllowInteractiveAuthorization" value="1 &lt;&lt; 1" />
</enum>
<enum name="DBusCapabilityFlags" cname="GDBusCapabilityFlags" type="flags">
<member cname="G_DBUS_CAPABILITY_FLAGS_NONE" name="None" />
@ -138,6 +139,7 @@
<member cname="G_DBUS_MESSAGE_FLAGS_NONE" name="None" />
<member cname="G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED" name="NoReplyExpected" value="1 &lt;&lt; 0" />
<member cname="G_DBUS_MESSAGE_FLAGS_NO_AUTO_START" name="NoAutoStart" value="1 &lt;&lt; 1" />
<member cname="G_DBUS_MESSAGE_FLAGS_ALLOW_INTERACTIVE_AUTHORIZATION" name="AllowInteractiveAuthorization" value="1 &lt;&lt; 2" />
</enum>
<enum name="DBusMessageHeaderField" cname="GDBusMessageHeaderField" type="enum">
<member cname="G_DBUS_MESSAGE_HEADER_FIELD_INVALID" name="Invalid" />
@ -272,12 +274,16 @@
<member cname="G_FILE_MONITOR_EVENT_PRE_UNMOUNT" name="PreUnmount" />
<member cname="G_FILE_MONITOR_EVENT_UNMOUNTED" name="Unmounted" />
<member cname="G_FILE_MONITOR_EVENT_MOVED" name="Moved" />
<member cname="G_FILE_MONITOR_EVENT_RENAMED" name="Renamed" />
<member cname="G_FILE_MONITOR_EVENT_MOVED_IN" name="MovedIn" />
<member cname="G_FILE_MONITOR_EVENT_MOVED_OUT" name="MovedOut" />
</enum>
<enum name="FileMonitorFlags" cname="GFileMonitorFlags" gtype="g_file_monitor_flags_get_type" type="flags">
<member cname="G_FILE_MONITOR_NONE" name="None" />
<member cname="G_FILE_MONITOR_WATCH_MOUNTS" name="WatchMounts" value="1 &lt;&lt; 0" />
<member cname="G_FILE_MONITOR_SEND_MOVED" name="SendMoved" value="1 &lt;&lt; 1" />
<member cname="G_FILE_MONITOR_WATCH_HARD_LINKS" name="WatchHardLinks" value="1 &lt;&lt; 2" />
<member cname="G_FILE_MONITOR_WATCH_MOVES" name="WatchMoves" value="1 &lt;&lt; 3" />
</enum>
<enum name="FileQueryInfoFlags" cname="GFileQueryInfoFlags" gtype="g_file_query_info_flags_get_type" type="flags">
<member cname="G_FILE_QUERY_INFO_NONE" name="None" />
@ -438,6 +444,12 @@
<member cname="G_SOCKET_FAMILY_IPV4" name="Ipv4" value="GLIB_SYSDEF_AF_INET" />
<member cname="G_SOCKET_FAMILY_IPV6" name="Ipv6" value="GLIB_SYSDEF_AF_INET6" />
</enum>
<enum name="SocketListenerEvent" cname="GSocketListenerEvent" gtype="g_socket_listener_event_get_type" type="enum">
<member cname="G_SOCKET_LISTENER_BINDING" name="Binding" />
<member cname="G_SOCKET_LISTENER_BOUND" name="Bound" />
<member cname="G_SOCKET_LISTENER_LISTENING" name="Listening" />
<member cname="G_SOCKET_LISTENER_LISTENED" name="Listened" />
</enum>
<enum name="SocketMsgFlags" cname="GSocketMsgFlags" gtype="g_socket_msg_flags_get_type" type="enum">
<member cname="G_SOCKET_MSG_NONE" name="None" />
<member cname="G_SOCKET_MSG_OOB" name="Oob" value="GLIB_SYSDEF_MSG_OOB" />
@ -528,6 +540,25 @@
<member cname="G_UNIX_SOCKET_ADDRESS_ABSTRACT" name="Abstract" />
<member cname="G_UNIX_SOCKET_ADDRESS_ABSTRACT_PADDED" name="AbstractPadded" />
</enum>
<enum name="Win32RegistryKeyWatcherFlags" cname="GWin32RegistryKeyWatcherFlags" type="flags">
<member cname="G_WIN32_REGISTRY_WATCH_NAME" name="Name" value="1 &lt;&lt; 0" />
<member cname="G_WIN32_REGISTRY_WATCH_ATTRIBUTES" name="Attributes" value="1 &lt;&lt; 1" />
<member cname="G_WIN32_REGISTRY_WATCH_VALUES" name="Values" value="1 &lt;&lt; 2" />
<member cname="G_WIN32_REGISTRY_WATCH_SECURITY" name="Security" value="1 &lt;&lt; 3" />
</enum>
<enum name="Win32RegistryValueType" cname="GWin32RegistryValueType" type="enum">
<member cname="G_WIN32_REGISTRY_VALUE_NONE" name="None" />
<member cname="G_WIN32_REGISTRY_VALUE_BINARY" name="Binary" value="1" />
<member cname="G_WIN32_REGISTRY_VALUE_UINT32LE" name="Uint32le" value="2" />
<member cname="G_WIN32_REGISTRY_VALUE_UINT32BE" name="Uint32be" value="3" />
<member cname="G_WIN32_REGISTRY_VALUE_UINT32" name="Uint32" value="2" />
<member cname="G_WIN32_REGISTRY_VALUE_EXPAND_STR" name="ExpandStr" value="4" />
<member cname="G_WIN32_REGISTRY_VALUE_LINK" name="Link" value="5" />
<member cname="G_WIN32_REGISTRY_VALUE_MULTI_STR" name="MultiStr" value="6" />
<member cname="G_WIN32_REGISTRY_VALUE_UINT64LE" name="Uint64le" value="7" />
<member cname="G_WIN32_REGISTRY_VALUE_UINT64" name="Uint64" value="7" />
<member cname="G_WIN32_REGISTRY_VALUE_STR" name="Str" value="8" />
</enum>
<enum name="ZlibCompressorFormat" cname="GZlibCompressorFormat" gtype="g_zlib_compressor_format_get_type" type="enum">
<member cname="G_ZLIB_COMPRESSOR_FORMAT_ZLIB" name="Zlib" />
<member cname="G_ZLIB_COMPRESSOR_FORMAT_GZIP" name="Gzip" />
@ -654,6 +685,13 @@
<parameter type="GCancellable*" name="cancellable" />
</parameters>
</callback>
<callback name="Win32RegistryKeyWatchCallbackFunc" cname="GWin32RegistryKeyWatchCallbackFunc">
<return-type type="void" />
<parameters>
<parameter type="GWin32RegistryKey*" name="key" />
<parameter type="gpointer" name="user_data" />
</parameters>
</callback>
<interface name="Action" cname="GAction">
<class_struct cname="GActionInterface">
<field name="GIface" cname="g_iface" type="GTypeInterface" />
@ -4447,11 +4485,24 @@
<interface name="TlsClientConnection" cname="GTlsClientConnection">
<class_struct cname="GTlsClientConnectionInterface">
<field name="GIface" cname="g_iface" type="GTypeInterface" />
<method vm="copy_session_state" />
</class_struct>
<property name="ValidationFlags" cname="validation-flags" type="GTlsCertificateFlags" readable="true" writeable="true" construct="true" />
<property name="ServerIdentity" cname="server-identity" type="GSocketConnectable" readable="true" writeable="true" construct="true" />
<property name="UseSsl3" cname="use-ssl3" type="gboolean" readable="true" writeable="true" construct="true" />
<property name="AcceptedCas" cname="accepted-cas" type="gpointer" readable="true" />
<virtual_method name="CopySessionState" cname="copy_session_state">
<return-type type="void" />
<parameters>
<parameter type="GTlsClientConnection*" name="source" />
</parameters>
</virtual_method>
<method name="CopySessionState" cname="g_tls_client_connection_copy_session_state">
<return-type type="void" />
<parameters>
<parameter type="GTlsClientConnection*" name="source" />
</parameters>
</method>
<method name="GetAcceptedCas" cname="g_tls_client_connection_get_accepted_cas">
<return-type type="GList*" />
</method>
@ -6905,7 +6956,6 @@
</signal>
<property name="RateLimit" cname="rate-limit" type="gint" readable="true" writeable="true" />
<property name="Cancelled" cname="cancelled" type="gboolean" readable="true" />
<property name="Context" cname="context" type="GMainContext" writeable="true" construct-only="true" />
<virtual_method name="Cancel" cname="cancel">
<return-type type="gboolean" />
<parameters />
@ -7776,37 +7826,6 @@
</parameters>
</method>
</object>
<object name="LocalDirectoryMonitor" cname="GLocalDirectoryMonitor" parent="GFileMonitor">
<class_struct cname="GLocalDirectoryMonitorClass">
<field name="ParentClass" cname="parent_class" type="GFileMonitorClass" />
<field name="MountNotify" cname="mount_notify" type="gboolean" />
<method vm="is_supported" />
<method vm="start" />
</class_struct>
<field name="Dirname" cname="dirname" type="gchar*" />
<field name="Flags" cname="flags" type="GFileMonitorFlags" />
<field name="WasMounted" cname="was_mounted" type="gboolean" />
<field name="MountMonitor" cname="mount_monitor" type="GUnixMountMonitor*" />
<property name="Dirname" cname="dirname" type="gchar*" writeable="true" construct-only="true" />
<property name="Flags" cname="flags" type="GFileMonitorFlags" writeable="true" construct-only="true" />
<virtual_method name="IsSupported" cname="is_supported" shared="true">
<return-type type="gboolean" />
</virtual_method>
<virtual_method name="Start" cname="start">
<return-type type="void" />
<parameters />
</virtual_method>
<constructor cname="g_local_directory_monitor_new_in_worker">
<parameters>
<parameter type="const-char*" name="pathname" />
<parameter type="GFileMonitorFlags" name="flags" />
<parameter type="GError**" name="error" />
</parameters>
</constructor>
<method name="Start" cname="g_local_directory_monitor_start">
<return-type type="void" />
</method>
</object>
<object name="LocalFileEnumerator" cname="GLocalFileEnumerator" parent="GFileEnumerator">
<class_struct cname="GLocalFileEnumeratorClass">
<field name="ParentClass" cname="parent_class" type="GFileEnumeratorClass" />
@ -8511,6 +8530,21 @@
</parameters>
</method>
</object>
<object name="NativeSocketAddress" cname="GNativeSocketAddress" parent="GSocketAddress">
<class_struct cname="GNativeSocketAddressClass">
<field name="ParentClass" cname="parent_class" type="GSocketAddressClass" />
</class_struct>
<field name="Priv" cname="priv" type="GNativeSocketAddressPrivate*" />
<method name="GetType" cname="g_native_socket_address_get_type" shared="true">
<return-type type="GType" />
</method>
<constructor cname="g_native_socket_address_new">
<parameters>
<parameter type="gpointer" name="native" />
<parameter type="gsize" name="len" />
</parameters>
</constructor>
</object>
<object name="NativeVolumeMonitor" cname="GNativeVolumeMonitor" parent="GVolumeMonitor">
<class_struct cname="GNativeVolumeMonitorClass">
<field name="ParentClass" cname="parent_class" type="GVolumeMonitorClass" />
@ -9249,6 +9283,7 @@
<property name="State" cname="state" type="variant" readable="true" />
<property name="Object" cname="object" type="GObject" writeable="true" construct-only="true" />
<property name="PropertyName" cname="property-name" type="gchar*" writeable="true" construct-only="true" />
<property name="InvertBoolean" cname="invert-boolean" type="gboolean" readable="true" writeable="true" construct-only="true" />
<implements>
<interface cname="GAction" />
</implements>
@ -9813,7 +9848,7 @@
<method name="ListChildren" cname="g_settings_list_children">
<return-type type="gchar**" />
</method>
<method name="ListKeys" cname="g_settings_list_keys">
<method name="ListKeys" cname="g_settings_list_keys" deprecated="1">
<return-type type="gchar**" />
</method>
<method name="ListRelocatableSchemas" cname="g_settings_list_relocatable_schemas" deprecated="1" shared="true">
@ -9973,28 +10008,28 @@
<implements>
<interface cname="GAsyncResult" />
</implements>
<method name="Complete" cname="g_simple_async_result_complete">
<method name="Complete" cname="g_simple_async_result_complete" deprecated="1">
<return-type type="void" />
</method>
<method name="CompleteInIdle" cname="g_simple_async_result_complete_in_idle">
<method name="CompleteInIdle" cname="g_simple_async_result_complete_in_idle" deprecated="1">
<return-type type="void" />
</method>
<method name="GetOpResGboolean" cname="g_simple_async_result_get_op_res_gboolean">
<method name="GetOpResGboolean" cname="g_simple_async_result_get_op_res_gboolean" deprecated="1">
<return-type type="gboolean" />
</method>
<method name="GetOpResGpointer" cname="g_simple_async_result_get_op_res_gpointer">
<method name="GetOpResGpointer" cname="g_simple_async_result_get_op_res_gpointer" deprecated="1">
<return-type type="gpointer" />
</method>
<method name="GetOpResGssize" cname="g_simple_async_result_get_op_res_gssize">
<method name="GetOpResGssize" cname="g_simple_async_result_get_op_res_gssize" deprecated="1">
<return-type type="gssize" />
</method>
<method name="GetSourceTag" cname="g_simple_async_result_get_source_tag">
<method name="GetSourceTag" cname="g_simple_async_result_get_source_tag" deprecated="1">
<return-type type="gpointer" />
</method>
<method name="GetType" cname="g_simple_async_result_get_type" shared="true">
<return-type type="GType" />
</method>
<method name="IsValid" cname="g_simple_async_result_is_valid" shared="true">
<method name="IsValid" cname="g_simple_async_result_is_valid" deprecated="1" shared="true">
<return-type type="gboolean" />
<parameters>
<parameter type="GAsyncResult*" name="result" />
@ -10002,7 +10037,7 @@
<parameter type="gpointer" name="source_tag" />
</parameters>
</method>
<constructor cname="g_simple_async_result_new">
<constructor cname="g_simple_async_result_new" deprecated="1">
<parameters>
<parameter type="GObject*" name="source_object" />
<parameter type="GAsyncReadyCallback" name="callback" />
@ -10010,7 +10045,7 @@
<parameter type="gpointer" name="source_tag" />
</parameters>
</constructor>
<constructor cname="g_simple_async_result_new_error">
<constructor cname="g_simple_async_result_new_error" deprecated="1">
<parameters>
<parameter type="GObject*" name="source_object" />
<parameter type="GAsyncReadyCallback" name="callback" />
@ -10021,7 +10056,7 @@
<parameter ellipsis="true" printf_format_args="true" />
</parameters>
</constructor>
<constructor cname="g_simple_async_result_new_from_error">
<constructor cname="g_simple_async_result_new_from_error" deprecated="1">
<parameters>
<parameter type="GObject*" name="source_object" />
<parameter type="GAsyncReadyCallback" name="callback" />
@ -10029,7 +10064,7 @@
<parameter type="const-GError*" name="error" />
</parameters>
</constructor>
<constructor cname="g_simple_async_result_new_take_error">
<constructor cname="g_simple_async_result_new_take_error" deprecated="1">
<parameters>
<parameter type="GObject*" name="source_object" />
<parameter type="GAsyncReadyCallback" name="callback" />
@ -10037,13 +10072,13 @@
<parameter type="GError*" name="error" />
</parameters>
</constructor>
<method name="PropagateError" cname="g_simple_async_result_propagate_error">
<method name="PropagateError" cname="g_simple_async_result_propagate_error" deprecated="1">
<return-type type="gboolean" />
<parameters>
<parameter type="GError**" name="dest" />
</parameters>
</method>
<method name="RunInThread" cname="g_simple_async_result_run_in_thread">
<method name="RunInThread" cname="g_simple_async_result_run_in_thread" deprecated="1">
<return-type type="void" />
<parameters>
<parameter type="GSimpleAsyncThreadFunc" name="func" />
@ -10057,7 +10092,7 @@
<parameter type="GCancellable*" name="check_cancellable" />
</parameters>
</method>
<method name="SetError" cname="g_simple_async_result_set_error">
<method name="SetError" cname="g_simple_async_result_set_error" deprecated="1">
<return-type type="void" />
<parameters>
<parameter type="GQuark" name="domain" />
@ -10066,7 +10101,7 @@
<parameter ellipsis="true" printf_format_args="true" />
</parameters>
</method>
<method name="SetErrorVa" cname="g_simple_async_result_set_error_va">
<method name="SetErrorVa" cname="g_simple_async_result_set_error_va" deprecated="1">
<return-type type="void" />
<parameters>
<parameter type="GQuark" name="domain" />
@ -10075,38 +10110,38 @@
<parameter type="va_list" name="args" />
</parameters>
</method>
<method name="SetFromError" cname="g_simple_async_result_set_from_error">
<method name="SetFromError" cname="g_simple_async_result_set_from_error" deprecated="1">
<return-type type="void" />
<parameters>
<parameter type="const-GError*" name="error" />
</parameters>
</method>
<method name="SetHandleCancellation" cname="g_simple_async_result_set_handle_cancellation">
<method name="SetHandleCancellation" cname="g_simple_async_result_set_handle_cancellation" deprecated="1">
<return-type type="void" />
<parameters>
<parameter type="gboolean" name="handle_cancellation" />
</parameters>
</method>
<method name="SetOpResGboolean" cname="g_simple_async_result_set_op_res_gboolean">
<method name="SetOpResGboolean" cname="g_simple_async_result_set_op_res_gboolean" deprecated="1">
<return-type type="void" />
<parameters>
<parameter type="gboolean" name="op_res" />
</parameters>
</method>
<method name="SetOpResGpointer" cname="g_simple_async_result_set_op_res_gpointer">
<method name="SetOpResGpointer" cname="g_simple_async_result_set_op_res_gpointer" deprecated="1">
<return-type type="void" />
<parameters>
<parameter type="gpointer" name="op_res" />
<parameter type="GDestroyNotify" name="destroy_op_res" />
</parameters>
</method>
<method name="SetOpResGssize" cname="g_simple_async_result_set_op_res_gssize">
<method name="SetOpResGssize" cname="g_simple_async_result_set_op_res_gssize" deprecated="1">
<return-type type="void" />
<parameters>
<parameter type="gssize" name="op_res" />
</parameters>
</method>
<method name="TakeError" cname="g_simple_async_result_take_error">
<method name="TakeError" cname="g_simple_async_result_take_error" deprecated="1">
<return-type type="void" />
<parameters>
<parameter type="GError*" name="error" />
@ -10732,7 +10767,7 @@
<class_struct cname="GSocketListenerClass">
<field name="ParentClass" cname="parent_class" type="GObjectClass" />
<method vm="changed" />
<method vm="_g_reserved1" />
<method signal_vm="event" />
<method vm="_g_reserved2" />
<method vm="_g_reserved3" />
<method vm="_g_reserved4" />
@ -10741,13 +10776,17 @@
</class_struct>
<field name="Priv" cname="priv" type="GSocketListenerPrivate*" />
<property name="ListenBacklog" cname="listen-backlog" type="gint" readable="true" writeable="true" construct="true" />
<signal name="Event" cname="event" when="LAST" field_name="event">
<return-type type="void" />
<parameters>
<parameter type="GSocketListenerEvent*" name="event" />
<parameter type="GSocket*" name="socket" />
</parameters>
</signal>
<virtual_method name="Changed" cname="changed">
<return-type type="void" />
<parameters />
</virtual_method>
<virtual_method name="GReserved1" cname="_g_reserved1" shared="true" padding="true">
<return-type type="void" />
</virtual_method>
<virtual_method name="GReserved2" cname="_g_reserved2" shared="true" padding="true">
<return-type type="void" />
</virtual_method>
@ -10888,6 +10927,7 @@
<parameter type="GObject*" name="source_object" />
</parameters>
</signal>
<property name="Active" cname="active" type="gboolean" readable="true" writeable="true" construct="true" />
<virtual_method name="GReserved1" cname="_g_reserved1" shared="true" padding="true">
<return-type type="void" />
</virtual_method>
@ -12789,6 +12829,90 @@
<return-type type="GList*" />
</method>
</object>
<object name="Win32RegistryKey" cname="GWin32RegistryKey" parent="GObject">
<class_struct cname="GWin32RegistryKeyClass">
<field name="ParentClass" cname="parent_class" type="GObjectClass" />
</class_struct>
<field name="Priv" cname="priv" type="GWin32RegistryKeyPrivate*" />
<property name="Path" cname="path" type="gchar*" readable="true" writeable="true" construct-only="true" />
<property name="PathUtf16" cname="path-utf16" type="gpointer" readable="true" writeable="true" construct-only="true" />
<implements>
<interface cname="GInitable" />
</implements>
<method name="EraseChangeIndicator" cname="g_win32_registry_key_erase_change_indicator">
<return-type type="void" />
</method>
<method name="GetChild" cname="g_win32_registry_key_get_child">
<return-type type="GWin32RegistryKey*" />
<parameters>
<parameter type="const-gchar*" name="subkey" />
<parameter type="GError**" name="error" />
</parameters>
</method>
<method name="GetChildW" cname="g_win32_registry_key_get_child_w">
<return-type type="GWin32RegistryKey*" />
<parameters>
<parameter type="const-gunichar2*" name="subkey" />
<parameter type="GError**" name="error" />
</parameters>
</method>
<method name="GetPath" cname="g_win32_registry_key_get_path">
<return-type type="const-gchar*" />
</method>
<method name="GetPathW" cname="g_win32_registry_key_get_path_w">
<return-type type="const-gunichar2*" />
</method>
<method name="GetType" cname="g_win32_registry_key_get_type" shared="true">
<return-type type="GType" />
</method>
<method name="GetValue" cname="g_win32_registry_key_get_value">
<return-type type="gboolean" />
<parameters>
<parameter type="gboolean" name="auto_expand" />
<parameter type="const-gchar*" name="value_name" />
<parameter type="GWin32RegistryValueType*" name="value_type" />
<parameter type="gpointer*" name="value_data" />
<parameter type="gsize*" name="value_data_size" />
<parameter type="GError**" name="error" />
</parameters>
</method>
<method name="GetValueW" cname="g_win32_registry_key_get_value_w">
<return-type type="gboolean" />
<parameters>
<parameter type="gboolean" name="auto_expand" />
<parameter type="const-gunichar2*" name="value_name" />
<parameter type="GWin32RegistryValueType*" name="value_type" />
<parameter type="gpointer*" name="value_data" />
<parameter type="gsize*" name="value_data_size" />
<parameter type="GError**" name="error" />
</parameters>
</method>
<method name="HasChanged" cname="g_win32_registry_key_has_changed">
<return-type type="gboolean" />
</method>
<constructor cname="g_win32_registry_key_new">
<parameters>
<parameter type="const-gchar*" name="path" />
<parameter type="GError**" name="error" />
</parameters>
</constructor>
<constructor cname="g_win32_registry_key_new_w">
<parameters>
<parameter type="const-gunichar2*" name="path" />
<parameter type="GError**" name="error" />
</parameters>
</constructor>
<method name="Watch" cname="g_win32_registry_key_watch">
<return-type type="gboolean" />
<parameters>
<parameter type="gboolean" name="watch_children" />
<parameter type="GWin32RegistryKeyWatcherFlags" name="watch_flags" />
<parameter type="GWin32RegistryKeyWatchCallbackFunc" name="callback" />
<parameter type="gpointer" name="user_data" />
<parameter type="GError**" name="error" />
</parameters>
</method>
</object>
<object name="ZlibCompressor" cname="GZlibCompressor" parent="GObject">
<class_struct cname="GZlibCompressorClass">
<field name="ParentClass" cname="parent_class" type="GObjectClass" />
@ -12841,7 +12965,6 @@
</object>
<struct name="ExportedObject" cname="ExportedObject" opaque="true" />
<struct name="ExportedSubtree" cname="ExportedSubtree" opaque="true" />
<struct name="FileChange" cname="FileChange" opaque="true" />
<struct name="ActionEntry" cname="GActionEntry">
<field name="Name" cname="name" type="const-gchar*" />
<callback cname="activate">
@ -12860,6 +12983,7 @@
</callback>
<field name="Padding" cname="padding" array_len="3" type="gsize" access="private" />
</struct>
<struct name="CocoaNotificationBackend" cname="GCocoaNotificationBackend" opaque="true" />
<struct name="ContextSpecificGroup" cname="GContextSpecificGroup">
<field name="Table" cname="table" type="GHashTable*" />
<field name="Lock" cname="lock" type="GMutex" />
@ -13278,6 +13402,171 @@
<struct name="TestDBus" cname="GTestDBus" opaque="true" />
<struct name="TestDBusClass" cname="GTestDBusClass" opaque="true" />
<struct name="TlsFileDatabase" cname="GTlsFileDatabase" opaque="true" />
<struct name="Win32AppInfoApplication" cname="GWin32AppInfoApplication" opaque="true" />
<struct name="Win32AppInfoApplicationClass" cname="GWin32AppInfoApplicationClass" opaque="true" />
<struct name="Win32AppInfoFileExtension" cname="GWin32AppInfoFileExtension" opaque="true" />
<struct name="Win32AppInfoFileExtensionClass" cname="GWin32AppInfoFileExtensionClass" opaque="true" />
<struct name="Win32AppInfoHandler" cname="GWin32AppInfoHandler" opaque="true" />
<struct name="Win32AppInfoHandlerClass" cname="GWin32AppInfoHandlerClass" opaque="true" />
<struct name="Win32AppInfoURLSchema" cname="GWin32AppInfoURLSchema" opaque="true" />
<struct name="Win32AppInfoURLSchemaClass" cname="GWin32AppInfoURLSchemaClass" opaque="true" />
<boxed name="Win32RegistrySubkeyIter" cname="GWin32RegistrySubkeyIter">
<field name="Key" cname="key" type="GWin32RegistryKey*" access="private" />
<field name="Counter" cname="counter" type="gint" access="private" />
<field name="SubkeyCount" cname="subkey_count" type="gint" access="private" />
<field name="SubkeyName" cname="subkey_name" type="gunichar2*" access="private" />
<field name="SubkeyNameSize" cname="subkey_name_size" type="gsize" access="private" />
<field name="SubkeyNameLen" cname="subkey_name_len" type="gsize" access="private" />
<field name="SubkeyNameU8" cname="subkey_name_u8" type="gchar*" access="private" />
<method name="Assign" cname="g_win32_registry_subkey_iter_assign">
<return-type type="void" />
<parameters>
<parameter type="const-GWin32RegistrySubkeyIter*" name="other" />
</parameters>
</method>
<method name="Clear" cname="g_win32_registry_subkey_iter_clear">
<return-type type="void" />
</method>
<method name="Copy" cname="g_win32_registry_subkey_iter_copy">
<return-type type="GWin32RegistrySubkeyIter*" owned="true" />
</method>
<method name="Free" cname="g_win32_registry_subkey_iter_free">
<return-type type="void" />
</method>
<method name="GetName" cname="g_win32_registry_subkey_iter_get_name">
<return-type type="gboolean" />
<parameters>
<parameter type="gchar**" name="subkey_name" />
<parameter type="gsize*" name="subkey_name_len" />
<parameter type="GError**" name="error" />
</parameters>
</method>
<method name="GetNameW" cname="g_win32_registry_subkey_iter_get_name_w">
<return-type type="gboolean" />
<parameters>
<parameter type="gunichar2**" name="subkey_name" />
<parameter type="gsize*" name="subkey_name_len" />
<parameter type="GError**" name="error" />
</parameters>
</method>
<method name="GetType" cname="g_win32_registry_subkey_iter_get_type" shared="true">
<return-type type="GType" />
</method>
<method name="Init" cname="g_win32_registry_subkey_iter_init">
<return-type type="gboolean" />
<parameters>
<parameter type="GWin32RegistryKey*" name="key" />
<parameter type="GError**" name="error" />
</parameters>
</method>
<method name="NSubkeys" cname="g_win32_registry_subkey_iter_n_subkeys">
<return-type type="gsize" />
</method>
<method name="Next" cname="g_win32_registry_subkey_iter_next">
<return-type type="gboolean" />
<parameters>
<parameter type="gboolean" name="skip_errors" />
<parameter type="GError**" name="error" />
</parameters>
</method>
</boxed>
<boxed name="Win32RegistryValueIter" cname="GWin32RegistryValueIter">
<field name="Key" cname="key" type="GWin32RegistryKey*" access="private" />
<field name="Counter" cname="counter" type="gint" access="private" />
<field name="ValueCount" cname="value_count" type="gint" access="private" />
<field name="ValueName" cname="value_name" type="gunichar2*" access="private" />
<field name="ValueNameSize" cname="value_name_size" type="gsize" access="private" />
<field name="ValueNameLen" cname="value_name_len" type="gsize" access="private" />
<field name="ValueType" cname="value_type" type="GWin32RegistryValueType" access="private" />
<field name="ValueData" cname="value_data" type="guint8*" access="private" />
<field name="ValueDataSize" cname="value_data_size" type="gsize" access="private" />
<field name="ValueActualDataSize" cname="value_actual_data_size" type="gsize" access="private" />
<field name="ValueExpandedType" cname="value_expanded_type" type="GWin32RegistryValueType" access="private" />
<field name="ValueDataExpanded" cname="value_data_expanded" type="gunichar2*" access="private" />
<field name="ValueDataExpandedCharsize" cname="value_data_expanded_charsize" type="gsize" access="private" />
<field name="ValueNameU8" cname="value_name_u8" type="gchar*" access="private" />
<field name="ValueNameU8Len" cname="value_name_u8_len" type="gsize" access="private" />
<field name="ValueDataU8" cname="value_data_u8" type="gchar*" access="private" />
<field name="ValueDataU8Size" cname="value_data_u8_size" type="gsize" access="private" />
<field name="ValueDataExpandedU8" cname="value_data_expanded_u8" type="gchar*" access="private" />
<field name="ValueDataExpandedU8Size" cname="value_data_expanded_u8_size" type="gsize" access="private" />
<method name="Assign" cname="g_win32_registry_value_iter_assign">
<return-type type="void" />
<parameters>
<parameter type="const-GWin32RegistryValueIter*" name="other" />
</parameters>
</method>
<method name="Clear" cname="g_win32_registry_value_iter_clear">
<return-type type="void" />
</method>
<method name="Copy" cname="g_win32_registry_value_iter_copy">
<return-type type="GWin32RegistryValueIter*" owned="true" />
</method>
<method name="Free" cname="g_win32_registry_value_iter_free">
<return-type type="void" />
</method>
<method name="GetData" cname="g_win32_registry_value_iter_get_data">
<return-type type="gboolean" />
<parameters>
<parameter type="gboolean" name="auto_expand" />
<parameter type="gpointer*" name="value_data" />
<parameter type="gsize*" name="value_data_size" />
<parameter type="GError**" name="error" />
</parameters>
</method>
<method name="GetDataW" cname="g_win32_registry_value_iter_get_data_w">
<return-type type="gboolean" />
<parameters>
<parameter type="gboolean" name="auto_expand" />
<parameter type="gpointer*" name="value_data" />
<parameter type="gsize*" name="value_data_size" />
<parameter type="GError**" name="error" />
</parameters>
</method>
<method name="GetName" cname="g_win32_registry_value_iter_get_name">
<return-type type="gboolean" />
<parameters>
<parameter type="gchar**" name="value_name" />
<parameter type="gsize*" name="value_name_len" />
<parameter type="GError**" name="error" />
</parameters>
</method>
<method name="GetNameW" cname="g_win32_registry_value_iter_get_name_w">
<return-type type="gboolean" />
<parameters>
<parameter type="gunichar2**" name="value_name" />
<parameter type="gsize*" name="value_name_len" />
<parameter type="GError**" name="error" />
</parameters>
</method>
<method name="GetType" cname="g_win32_registry_value_iter_get_type" shared="true">
<return-type type="GType" />
</method>
<method name="GetValueType" cname="g_win32_registry_value_iter_get_value_type">
<return-type type="gboolean" />
<parameters>
<parameter type="GWin32RegistryValueType*" name="value_type" />
<parameter type="GError**" name="error" />
</parameters>
</method>
<method name="Init" cname="g_win32_registry_value_iter_init">
<return-type type="gboolean" />
<parameters>
<parameter type="GWin32RegistryKey*" name="key" />
<parameter type="GError**" name="error" />
</parameters>
</method>
<method name="NValues" cname="g_win32_registry_value_iter_n_values">
<return-type type="gsize" />
</method>
<method name="Next" cname="g_win32_registry_value_iter_next">
<return-type type="gboolean" />
<parameters>
<parameter type="gboolean" name="skip_errors" />
<parameter type="GError**" name="error" />
</parameters>
</method>
</boxed>
<struct name="Win32WinsockFuncs" cname="GWin32WinsockFuncs" opaque="true" />
<struct name="MessageToWriteData" cname="MessageToWriteData" opaque="true" />
<struct name="SchemaState" cname="SchemaState" opaque="true" />
@ -13482,6 +13771,14 @@
<parameter type="GListStore*" name="store" />
</parameters>
</method>
<method name="StoreSort" cname="g_list_store_sort" shared="true">
<return-type type="void" />
<parameters>
<parameter type="GListStore*" name="store" />
<parameter type="GCompareDataFunc" name="compare_func" />
<parameter type="gpointer" name="user_data" />
</parameters>
</method>
<method name="StoreSplice" cname="g_list_store_splice" shared="true">
<return-type type="void" />
<parameters>
@ -13600,7 +13897,7 @@
</method>
</class>
<class name="Simple" cname="GSimple_">
<method name="AsyncReportErrorInIdle" cname="g_simple_async_report_error_in_idle" shared="true">
<method name="AsyncReportErrorInIdle" cname="g_simple_async_report_error_in_idle" deprecated="1" shared="true">
<return-type type="void" />
<parameters>
<parameter type="GObject*" name="object" />
@ -13612,7 +13909,7 @@
<parameter ellipsis="true" printf_format_args="true" />
</parameters>
</method>
<method name="AsyncReportGerrorInIdle" cname="g_simple_async_report_gerror_in_idle" shared="true">
<method name="AsyncReportGerrorInIdle" cname="g_simple_async_report_gerror_in_idle" deprecated="1" shared="true">
<return-type type="void" />
<parameters>
<parameter type="GObject*" name="object" />
@ -13621,7 +13918,7 @@
<parameter type="const-GError*" name="error" />
</parameters>
</method>
<method name="AsyncReportTakeGerrorInIdle" cname="g_simple_async_report_take_gerror_in_idle" shared="true">
<method name="AsyncReportTakeGerrorInIdle" cname="g_simple_async_report_take_gerror_in_idle" deprecated="1" shared="true">
<return-type type="void" />
<parameters>
<parameter type="GObject*" name="object" />

6
gtk/Gtk.metadata
View file

@ -60,7 +60,7 @@
<attr path="/api/namespace/callback[@cname='GtkClipboardRichTextReceivedFunc']" name="hidden">1</attr>
<attr path="/api/namespace/callback[@cname='GtkTextBufferSerializeFunc']/return-type" name="array_length_param">length</attr>
<attr path="/api/namespace/callback[@cname='GtkTextBufferDeserializeFunc']/*/*[@name='data']" name="array">1</attr>
<attr path="/api/namespace/callback[@cname='GtkTreeModelFilterModifyFunc']/parameters/parameter[@name='value']" name="pass_as">ref</attr>
<attr path="/api/namespace/callback[@cname='GtkTreeModelFilterModifyFunc']/parameters/parameter[@name='value']" name="pass_as">ref</attr>
<attr path="/api/namespace/callback[@cname='GtkModuleDisplayInitFunc']" name="hidden">1</attr>
<attr path="/api/namespace/callback[@cname='GtkModuleInitFunc']" name="hidden">1</attr>
<attr path="/api/namespace/class[@cname='GtkAccel_']/method[@name='GroupsFromObject']" name="hidden">1</attr>
@ -269,6 +269,7 @@
<attr path="/api/namespace/object[@cname='GtkButton']/signal[@name='Activate']" name="name">Activated</attr>
<attr path="/api/namespace/object[@cname='GtkButton']/signal[@name='Enter']" name="name">Entered</attr>
<attr path="/api/namespace/object[@cname='GtkButton']/signal[@name='Leave']" name="name">Left</attr>
<remove-node path="/api/namespace/object/implements/interface[@cname='GtkStyleProviderPrivate']" />
<attr path="/api/namespace/object[@cname='GtkCellArea']/*[@name='Foreach']/*/*[@name='callback']" name="scope">call</attr>
<attr path="/api/namespace/object[@cname='GtkCellArea']/*[@name='ForeachAlloc']/*/*[@name='callback']" name="scope">call</attr>
<attr path="/api/namespace/object[@cname='GtkCellArea']/method[@name='GetFocusSiblings']/return-type" name="element_type">GtkCellRenderer*</attr>
@ -432,6 +433,8 @@
<attr path="/api/namespace/object[@cname='GtkLabel']/constructor[@cname='gtk_label_new_with_mnemonic']" name="preferred">1</attr>
<attr path="/api/namespace/object[@cname='GtkLabel']/constructor[@cname='gtk_label_new_with_mnemonic']/*/*[@name='str']" name="property_name">label</attr>
<attr path="/api/namespace/object[@cname='GtkLabel']/property[@name='WrapMode']" name="name">LineWrapMode</attr>
<attr path="/api/namespace/object[@cname='GtkLabel']/method[@name='SetLabel']" name="name">SetLabelMarkup</attr>
<attr path="/api/namespace/object[@cname='GtkLabel']/method[@name='GetLabel']" name="name">GetLabelMarkup</attr>
<attr path="/api/namespace/object[@cname='GtkLayout']/method[@name='GetHadjustment']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkLayout']/method[@name='GetVadjustment']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkLayout']/method[@name='SetHadjustment']" name="hidden">1</attr>
@ -478,6 +481,7 @@
<attr path="/api/namespace/object[@cname='GtkPageSetup']/method[@name='ToFile']/*/*[@name='file_name']" name="type">const-gfilename*</attr>
<attr path="/api/namespace/object[@cname='GtkPlacesSidebar']/signal[@cname='show-connect-to-server']" name="name">ShowedConnectToServer</attr>
<attr path="/api/namespace/object[@cname='GtkPlacesSidebar']/signal[@cname='show-enter-location']" name="name">ShowEnteredLocation</attr>
<attr path="/api/namespace/object[@cname='GtkPlacesSidebar']/signal[@cname='show-other-locations']" name="name">ShowedOtherLocations</attr>
<attr path="/api/namespace/object[@cname='GtkPlug']/constructor[@cname='gtk_plug_new']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkPlug']/constructor[@cname='gtk_plug_new_for_display']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkPlug']/property[@name='Embedded']" name="name">IsEmbedded</attr>

2
gtk/TreeView.cs
View file

@ -28,6 +28,7 @@ namespace Gtk {
public partial class TreeView {
/*
public Gdk.Color OddRowColor {
get {
GLib.Value value = StyleGetPropertyValue ("odd-row-color");
@ -45,6 +46,7 @@ namespace Gtk {
return ret;
}
}
*/
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_tree_view_get_path_at_pos (IntPtr raw,

8
gtk/Widget.cs
View file

@ -40,11 +40,13 @@ namespace Gtk {
this.AddAccelerator (accel_signal, accel_group, (uint) accel_key.Key, accel_key.AccelMods, accel_key.AccelFlags);
}
/*
public int FocusLineWidth {
get {
return (int) StyleGetProperty ("focus-line-width");
}
}
*/
struct GClosure {
long fields;
@ -274,10 +276,12 @@ namespace Gtk {
return result;
}
/*
public void ModifyBase (Gtk.StateType state)
{
gtk_widget_modify_base (Handle, (int) state, IntPtr.Zero);
}
*/
public void ModifyBg (Gtk.StateType state)
{
@ -289,10 +293,12 @@ namespace Gtk {
gtk_widget_modify_fg (Handle, (int) state, IntPtr.Zero);
}
/*
public void ModifyText (Gtk.StateType state)
{
gtk_widget_modify_text (Handle, (int) state, IntPtr.Zero);
}
*/
public void Path (out string path, out string path_reversed)
{
@ -408,4 +414,4 @@ namespace Gtk {
InternalDestroyed -= NativeDestroyHandler;
}
}
}
}

969
gtk/gtk-api.raw
View file

File diff suppressed because it is too large Load diff

65
pango/pango-api.raw
View file

@ -36,6 +36,9 @@
<member cname="PANGO_ATTR_ABSOLUTE_SIZE" name="AbsoluteSize" />
<member cname="PANGO_ATTR_GRAVITY" name="Gravity" />
<member cname="PANGO_ATTR_GRAVITY_HINT" name="GravityHint" />
<member cname="PANGO_ATTR_FONT_FEATURES" name="FontFeatures" />
<member cname="PANGO_ATTR_FOREGROUND_ALPHA" name="ForegroundAlpha" />
<member cname="PANGO_ATTR_BACKGROUND_ALPHA" name="BackgroundAlpha" />
</enum>
<enum name="BidiType" cname="PangoBidiType" gtype="pango_bidi_type_get_type" type="enum">
<member cname="PANGO_BIDI_TYPE_L" name="L" />
@ -1137,6 +1140,12 @@
<parameter type="double" name="x22" />
</parameters>
</method>
<method name="GetAlpha" cname="pango_renderer_get_alpha">
<return-type type="guint16" />
<parameters>
<parameter type="PangoRenderPart" name="part" />
</parameters>
</method>
<method name="GetColor" cname="pango_renderer_get_color">
<return-type type="PangoColor*" />
<parameters>
@ -1161,6 +1170,13 @@
<parameter type="PangoRenderPart" name="part" />
</parameters>
</method>
<method name="SetAlpha" cname="pango_renderer_set_alpha">
<return-type type="void" />
<parameters>
<parameter type="PangoRenderPart" name="part" />
<parameter type="guint16" name="alpha" />
</parameters>
</method>
<method name="SetColor" cname="pango_renderer_set_color">
<return-type type="void" />
<parameters>
@ -1234,6 +1250,15 @@
</parameters>
</constructor>
</struct>
<struct name="AttrFontFeatures" cname="PangoAttrFontFeatures" opaque="true">
<field name="Attr" cname="attr" type="PangoAttribute" access="public" writeable="true" />
<field name="Features" cname="features" type="gchar*" access="public" writeable="true" />
<constructor cname="pango_attr_font_features_new">
<parameters>
<parameter type="const-gchar*" name="features" />
</parameters>
</constructor>
</struct>
<struct name="AttrInt" cname="PangoAttrInt">
<field name="Attr" cname="attr" type="PangoAttribute" />
<field name="Value" cname="value" type="int" />
@ -1486,7 +1511,6 @@
</method>
</struct>
<struct name="EngineLang" cname="PangoEngineLang" opaque="true" />
<struct name="EnginePair" cname="PangoEnginePair" opaque="true" />
<struct name="EngineShape" cname="PangoEngineShape" opaque="true" />
<struct name="FT2Family" cname="PangoFT2Family" opaque="true" />
<struct name="FT2Font" cname="PangoFT2Font" opaque="true" />
@ -2067,7 +2091,6 @@
<field name="IsExpandableSpace" cname="is_expandable_space" bits="1" type="guint" />
<field name="IsWordBoundary" cname="is_word_boundary" bits="1" type="guint" />
</struct>
<struct name="MapInfo" cname="PangoMapInfo" opaque="true" />
<boxed name="Matrix" cname="PangoMatrix">
<field name="Xx" cname="xx" type="double" />
<field name="Xy" cname="xy" type="double" />
@ -2090,6 +2113,13 @@
<method name="GetFontScaleFactor" cname="pango_matrix_get_font_scale_factor">
<return-type type="double" />
</method>
<method name="GetFontScaleFactors" cname="pango_matrix_get_font_scale_factors">
<return-type type="void" />
<parameters>
<parameter type="double*" name="xscale" />
<parameter type="double*" name="yscale" />
</parameters>
</method>
<method name="GetType" cname="pango_matrix_get_type" shared="true">
<return-type type="GType" />
</method>
@ -2140,8 +2170,6 @@
</parameters>
</method>
</boxed>
<struct name="Module" cname="PangoModule" opaque="true" />
<struct name="ModuleClass" cname="PangoModuleClass" opaque="true" />
<struct name="OTInfoClass" cname="PangoOTInfoClass" opaque="true" />
<struct name="OTRulesetClass" cname="PangoOTRulesetClass" opaque="true" />
<struct name="Rectangle" cname="PangoRectangle">
@ -2172,7 +2200,6 @@
<return-type type="gboolean" />
</method>
</struct>
<struct name="Submap" cname="PangoSubmap" opaque="true" />
<struct name="Tab" cname="PangoTab" opaque="true" />
<boxed name="TabArray" cname="PangoTabArray" opaque="true">
<method name="Copy" cname="pango_tab_array_copy">
@ -2308,6 +2335,12 @@
<struct name="Point" cname="Point" opaque="true" />
<struct name="RunInfo" cname="RunInfo" opaque="true" />
<class name="Attr" cname="PangoAttr_">
<method name="BackgroundAlphaNew" cname="pango_attr_background_alpha_new" shared="true">
<return-type type="PangoAttribute*" />
<parameters>
<parameter type="guint16" name="alpha" />
</parameters>
</method>
<method name="BackgroundNew" cname="pango_attr_background_new" shared="true">
<return-type type="PangoAttribute*" />
<parameters>
@ -2328,6 +2361,12 @@
<parameter type="const-char*" name="family" />
</parameters>
</method>
<method name="ForegroundAlphaNew" cname="pango_attr_foreground_alpha_new" shared="true">
<return-type type="PangoAttribute*" />
<parameters>
<parameter type="guint16" name="alpha" />
</parameters>
</method>
<method name="ForegroundNew" cname="pango_attr_foreground_new" shared="true">
<return-type type="PangoAttribute*" />
<parameters>
@ -2519,7 +2558,7 @@
<parameter type="PangoAttrIterator*" name="cached_iter" />
</parameters>
</method>
<method name="ParseEnum" cname="pango_parse_enum" shared="true">
<method name="ParseEnum" cname="pango_parse_enum" deprecated="1" shared="true">
<return-type type="gboolean" />
<parameters>
<parameter type="GType" name="type" />
@ -2580,7 +2619,7 @@
<parameter type="int*" name="position" />
</parameters>
</method>
<method name="ReadLine" cname="pango_read_line" shared="true">
<method name="ReadLine" cname="pango_read_line" deprecated="1" shared="true">
<return-type type="gint" />
<parameters>
<parameter type="FILE*" name="stream" />
@ -2593,21 +2632,21 @@
<parameter type="GList*" name="logical_items" />
</parameters>
</method>
<method name="ScanInt" cname="pango_scan_int" shared="true">
<method name="ScanInt" cname="pango_scan_int" deprecated="1" shared="true">
<return-type type="gboolean" />
<parameters>
<parameter type="const-char**" name="pos" />
<parameter type="int*" name="out" />
</parameters>
</method>
<method name="ScanString" cname="pango_scan_string" shared="true">
<method name="ScanString" cname="pango_scan_string" deprecated="1" shared="true">
<return-type type="gboolean" />
<parameters>
<parameter type="const-char**" name="pos" />
<parameter type="GString*" name="out" />
</parameters>
</method>
<method name="ScanWord" cname="pango_scan_word" shared="true">
<method name="ScanWord" cname="pango_scan_word" deprecated="1" shared="true">
<return-type type="gboolean" />
<parameters>
<parameter type="const-char**" name="pos" />
@ -2637,19 +2676,19 @@
<parameter type="PangoGlyphString*" name="glyphs" />
</parameters>
</method>
<method name="SkipSpace" cname="pango_skip_space" shared="true">
<method name="SkipSpace" cname="pango_skip_space" deprecated="1" shared="true">
<return-type type="gboolean" />
<parameters>
<parameter type="const-char**" name="pos" />
</parameters>
</method>
<method name="SplitFileList" cname="pango_split_file_list" shared="true">
<method name="SplitFileList" cname="pango_split_file_list" deprecated="1" shared="true">
<return-type type="char**" />
<parameters>
<parameter type="const-char*" name="str" />
</parameters>
</method>
<method name="TrimString" cname="pango_trim_string" shared="true">
<method name="TrimString" cname="pango_trim_string" deprecated="1" shared="true">
<return-type type="char*" />
<parameters>
<parameter type="const-char*" name="str" />

7
parser/gapi2xml.pl
View file

@ -1183,11 +1183,11 @@ sub parseInitFunc
}
}
if ($pspec_use) {
addPropElem2 ($prop.$pspec, $obj_el, 0);
# addPropElem2 ($prop.$pspec, $obj_el, 0);
} else {
addPropElem ($prop, $obj_el, 0);
$propcnt++;
}
$propcnt++;
} elsif ($line =~ /gtk_container_class_install_child_property/) {
my $prop = $line;
do {
@ -1208,9 +1208,12 @@ sub parseInitFunc
do {
$pspec .= $init_lines[++$linenum];
} until ($init_lines[$linenum] =~ /\)\s*;/);
addPropElem2 ($pspec, $obj_el, 0);
$propcnt++;
}
$linenum++;
}
return @signal_vms;
}

13
sources/Makefile.am
View file

@ -3,14 +3,14 @@ EXTRA_DIST = \
sources.xml \
gtk_tree_model_signal_fix.patch
TARGET_GTK_VERSION=3.16.6
TARGET_GTK_API=3.16
TARGET_GTK_VERSION=3.18.2
TARGET_GTK_API=3.18
GTK_DOWNLOADS = \
http://ftp.gnome.org/pub/GNOME/sources/glib/2.44/glib-2.44.1.tar.xz \
http://ftp.gnome.org/pub/GNOME/sources/pango/1.36/pango-1.36.8.tar.xz \
http://ftp.gnome.org/pub/GNOME/sources/atk/2.16/atk-2.16.0.tar.xz \
http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.30/gdk-pixbuf-2.30.8.tar.xz \
http://ftp.gnome.org/pub/GNOME/sources/glib/2.46/glib-2.46.1.tar.xz \
http://ftp.gnome.org/pub/GNOME/sources/pango/1.38/pango-1.38.1.tar.xz \
http://ftp.gnome.org/pub/GNOME/sources/atk/2.18/atk-2.18.0.tar.xz \
http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.32/gdk-pixbuf-2.32.1.tar.xz \
http://ftp.gnome.org/pub/GNOME/sources/gtk+/$(TARGET_GTK_API)/gtk+-$(TARGET_GTK_VERSION).tar.xz
api:
@ -27,4 +27,5 @@ get-source-code:
patch -p0 gtk+-$(TARGET_GTK_VERSION)/gtk/gtkselectionprivate.h < gtkselectionprivate-space.patch
patch -p0 gtk+-$(TARGET_GTK_VERSION)/gtk/gtktextattributes.h < gtktextattributes-gi-scanner.patch
patch -p0 gtk+-$(TARGET_GTK_VERSION)/gtk/gtktextview.h < gtk_text_view_public.patch
patch -p0 glib/2.46/gio/gwin32registrykey.h < gwin32registrykey-little-endian.patch

40
sources/gtktextattributes-gi-scanner.patch
View file

@ -1,6 +1,6 @@
--- gtk+-3.12.0/gtk/gtktextattributes.h 2014-03-24 18:28:56.000000000 +0100
+++ gtk+-3.12.0.new/gtk/gtktextattributes.h 2014-06-10 13:49:44.619905956 +0200
@@ -112,26 +112,12 @@
--- gtk+-3.18.2.orig/gtk/gtktextattributes.h 2015-11-09 13:28:27.852084380 +0100
+++ gtk+-3.18.2/gtk/gtktextattributes.h 2015-11-09 13:29:14.424084380 +0100
@@ -112,26 +112,7 @@
guint inside_selection : 1;
guint is_text : 1;
@ -18,12 +18,36 @@
- };
-#else
GdkRGBA *rgba[2];
#if (defined(__SIZEOF_INT__) && defined(__SIZEOF_POINTER__)) && (__SIZEOF_INT__ == __SIZEOF_POINTER__)
/* unusable, just for ABI compat */
/*< private >*/
guint padding[2];
#endif
-#if (defined(__SIZEOF_INT__) && defined(__SIZEOF_POINTER__)) && (__SIZEOF_INT__ == __SIZEOF_POINTER__)
- /* unusable, just for ABI compat */
- /*< private >*/
- guint padding[2];
-#endif
-#endif
};
/**
@@ -207,23 +188,7 @@
/*< public >*/
gint letter_spacing;
-#ifdef __GI_SCANNER__
- /* The scanner should only see the transparent union, so that its
- * content does not vary across architectures.
- */
- union {
- gchar *font_features;
- /*< private >*/
- guint padding[2];
- };
-#else
gchar *font_features;
-#if (defined(__SIZEOF_INT__) && defined(__SIZEOF_POINTER__)) && (__SIZEOF_INT__ == __SIZEOF_POINTER__)
- /* unusable, just for ABI compat */
- /*< private >*/
- guint padding[1];
-#endif
-#endif
};
GDK_AVAILABLE_IN_ALL

23
sources/gwin32registrykey-little-endian.patch Normal file
View file

@ -0,0 +1,23 @@
--- glib-2.46.1.orig/gio/gwin32registrykey.h 2015-11-09 13:36:38.873084380 +0100
+++ glib-2.46.1/gio/gwin32registrykey.h 2015-11-09 13:37:20.124084380 +0100
@@ -37,18 +37,12 @@
G_WIN32_REGISTRY_VALUE_BINARY = 1,
G_WIN32_REGISTRY_VALUE_UINT32LE = 2,
G_WIN32_REGISTRY_VALUE_UINT32BE = 3,
-#if G_BYTE_ORDER == G_BIG_ENDIAN
- G_WIN32_REGISTRY_VALUE_UINT32 = G_WIN32_REGISTRY_VALUE_UINT32BE,
-#else
- G_WIN32_REGISTRY_VALUE_UINT32 = G_WIN32_REGISTRY_VALUE_UINT32LE,
-#endif
+ G_WIN32_REGISTRY_VALUE_UINT32 = 2,
G_WIN32_REGISTRY_VALUE_EXPAND_STR = 4,
G_WIN32_REGISTRY_VALUE_LINK = 5,
G_WIN32_REGISTRY_VALUE_MULTI_STR = 6,
G_WIN32_REGISTRY_VALUE_UINT64LE = 7,
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
- G_WIN32_REGISTRY_VALUE_UINT64 = G_WIN32_REGISTRY_VALUE_UINT64LE,
-#endif
+ G_WIN32_REGISTRY_VALUE_UINT64 = 7,
G_WIN32_REGISTRY_VALUE_STR = 8
} GWin32RegistryValueType;

17
sources/sources.xml
View file

@ -2,7 +2,7 @@
<api filename="../gio/gio-api.raw">
<library name="libgio-2.0-0.dll">
<namespace name="G">
<directory path="glib-2.44.1/gio">
<directory path="glib-2.46.1/gio">
<exclude>gasynchelper.h</exclude>
<exclude>gcontenttypeprivate.h</exclude>
<exclude>gdelayedsettingsbackend.h</exclude>
@ -87,14 +87,14 @@
<api filename="../atk/atk-api.raw">
<library name="libatk-1.0-0.dll">
<namespace name="Atk">
<dir>atk-2.16.0/atk</dir>
<dir>atk-2.18.0/atk</dir>
</namespace>
</library>
</api>
<api filename="../pango/pango-api.raw">
<library name="libpango-1.0-0.dll">
<namespace name="Pango">
<directory path="pango-1.36.8/pango">
<directory path="pango-1.38.1/pango">
<exclude>pangoatsui.c</exclude>
<exclude>pangoatsui.h</exclude>
<exclude>pangoatsui-fontmap.h</exclude>
@ -136,17 +136,17 @@
<api filename="../gdk/gdk-api.raw">
<library name="libgdk-3-0.dll">
<namespace name="Gdk">
<directory path="gtk+-3.16.6/gdk">
<directory path="gtk+-3.18.2/gdk">
<exclude>gdkalias.h</exclude>
<exclude>gdkwindowimpl.h</exclude>
<exclude>keyname-table.h</exclude>
</directory>
<directory path="gtk+-3.16.6/gdk/deprecated" />
<directory path="gtk+-3.18.2/gdk/deprecated" />
</namespace>
</library>
<library name="libgdk_pixbuf-2.0-0.dll">
<namespace name="Gdk">
<directory path="gdk-pixbuf-2.30.8/gdk-pixbuf">
<directory path="gdk-pixbuf-2.32.1/gdk-pixbuf">
<exclude>io-gdip-native.h</exclude>
<exclude>io-gdip-propertytags.h</exclude>
<exclude>io-gdip-utils.h</exclude>
@ -161,7 +161,7 @@
<api filename="../gtk/gtk-api.raw">
<library name="libgtk-3-0.dll">
<namespace name="Gtk">
<directory path="gtk+-3.16.6/gtk">
<directory path="gtk+-3.18.2/gtk">
<!-- Internal stuff -->
<exclude>gtkalias.h</exclude>
<exclude>gtkappchooseronline.h</exclude>
@ -256,8 +256,9 @@
<exclude>gtktreeitem.h</exclude>
<exclude>gtkcellarea.c</exclude>
<exclude>gtklockbutton.h</exclude>
<exclude>gtksearchenginemodel.h</exclude>
</directory>
<directory path="gtk+-3.16.6/gtk/deprecated" />
<directory path="gtk+-3.18.2/gtk/deprecated" />
</namespace>
</library>
</api>