2009-01-04 Mike Kestner <mkestner@novell.com>

* *: update to 2.14.  parser support for GSEALed fields. svn build
	now uses bootstrap-2.14.  integrate gio-sharp module.  

svn path=/trunk/gtk-sharp/; revision=122402
This commit is contained in:
Mike Kestner 2009-01-04 22:29:56 +00:00
commit 146deaa38c
45 changed files with 7447 additions and 902 deletions

View file

@ -1,3 +1,8 @@
2009-01-04 Mike Kestner <mkestner@novell.com>
* *: update to 2.14. parser support for GSEALed fields. svn build
now uses bootstrap-2.14. integrate gio-sharp module.
2009-01-04 Mike Kestner <mkestner@novell.com>
* glib/GType.cs: fix incorrect null check noticed by Christian Hoff.

View file

@ -1,4 +1,4 @@
SUBDIRS = sources generator parser glib cairo pango atk gdk gtk glade gtkdotnet sample doc
SUBDIRS = sources generator parser glib gio cairo pango atk gdk gtk glade gtkdotnet sample doc
EXTRA_DIST = \
gtk-sharp.snk \

View file

@ -2017,7 +2017,7 @@
<method name="IsInline" cname="atk_hyperlink_is_inline">
<return-type type="gboolean" />
</method>
<method name="IsSelectedLink" cname="atk_hyperlink_is_selected_link">
<method name="IsSelectedLink" cname="atk_hyperlink_is_selected_link" deprecated="1">
<return-type type="gboolean" />
</method>
<method name="IsValid" cname="atk_hyperlink_is_valid">
@ -2285,10 +2285,10 @@
<method name="GetIndexInParent" cname="atk_object_get_index_in_parent">
<return-type type="gint" />
</method>
<method name="GetLayer" cname="atk_object_get_layer">
<method name="GetLayer" cname="atk_object_get_layer" deprecated="1">
<return-type type="AtkLayer" />
</method>
<method name="GetMdiZorder" cname="atk_object_get_mdi_zorder">
<method name="GetMdiZorder" cname="atk_object_get_mdi_zorder" deprecated="1">
<return-type type="gint" />
</method>
<method name="GetNAccessibleChildren" cname="atk_object_get_n_accessible_children">

View file

@ -1,12 +0,0 @@
#!/bin/sh
# Run this to set configure.in up for an API version.
GTK_SHARP_VERSION=2.12.8
ASSEMBLY_VERSION=2.12.0.0
POLICY_VERSIONS="2.4 2.6 2.8 2.10"
GTK_REQUIRED_VERSION=2.12.0
VERSIONCSDEFINES="-define:GTK_SHARP_2_6 -define:GTK_SHARP_2_8 -define:GTK_SHARP_2_10 -define:GTK_SHARP_2_12"
VERSIONCFLAGS="-DGTK_SHARP_2_6 -DGTK_SHARP_2_8 -DGTK_SHARP_2_10 -DGTK_SHARP_2_12"
GTK_API_TAG=2.12
. ./bootstrap-generic "$@"

12
bootstrap-2.14 Executable file
View file

@ -0,0 +1,12 @@
#!/bin/sh
# Run this to set configure.in up for an API version.
GTK_SHARP_VERSION=2.13.90
ASSEMBLY_VERSION=2.14.0.0
POLICY_VERSIONS="2.4 2.6 2.8 2.10 2.12"
GTK_REQUIRED_VERSION=2.13.5
VERSIONCSDEFINES="-define:GTK_SHARP_2_6 -define:GTK_SHARP_2_8 -define:GTK_SHARP_2_10 -define:GTK_SHARP_2_12 -define:GTK_SHARP_2_14"
VERSIONCFLAGS="-DGTK_SHARP_2_6 -DGTK_SHARP_2_8 -DGTK_SHARP_2_10 -DGTK_SHARP_2_12 -DGTK_SHARP_2_14"
GTK_API_TAG=2.14
. ./bootstrap-generic "$@"

View file

@ -174,6 +174,10 @@ PKG_CHECK_MODULES(GLIB, gobject-2.0 >= $GTK_REQUIRED_VERSION)
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
PKG_CHECK_MODULES(GIO, gio-2.0 >= $GTK_REQUIRED_VERSION)
AC_SUBST(GIO_CFLAGS)
AC_SUBST(GIO_LIBS)
PKG_CHECK_MODULES(PANGO, pango)
AC_SUBST(PANGO_CFLAGS)
AC_SUBST(PANGO_LIBS)
@ -228,6 +232,10 @@ glib/Makefile
glib/glib-sharp-2.0.pc
glib/glib-sharp.dll.config
glib/glue/Makefile
gio/Makefile
gio/gio-sharp-2.0.pc
gio/gio-sharp.dll.config
gio/glue/Makefile
cairo/Makefile
pango/Makefile
pango/pango-sharp.dll.config

30
gdk/Colormap.custom Normal file
View file

@ -0,0 +1,30 @@
// Gdk.Colormap.custom - Colormap customizations
//
// Copyright (c) 2009 Novell, Inc.
//
// This code is inserted after the automatically generated code.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of version 2 of the Lesser GNU General
// Public License as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this program; if not, write to the
// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA.
public int AllocColors (Gdk.Color[] colors, int n_colors, bool writeable, bool best_match, bool[] success)
{
return gdk_colormap_alloc_colors (Handle, colors, n_colors, writeable, best_match, success);
}
public void FreeColors (Gdk.Color[] colors, int n_colors)
{
gdk_colormap_free_colors (Handle, colors, n_colors);
}

View file

@ -64,7 +64,7 @@
<attr path="/api/namespace/object[@cname='GdkColormap']/method[@name='AllocColors']/*/*[@type='GdkColor*']" name="array">1</attr>
<attr path="/api/namespace/object[@cname='GdkColormap']/method[@name='AllocColors']/*/*[@name='success']" name="array">1</attr>
<attr path="/api/namespace/object[@cname='GdkColormap']/method[@name='QueryColor']/*/*[@type='GdkColor*']" name="pass_as">ref</attr>
<attr path="/api/namespace/object[@cname='GdkColormap']/method[@name='FreeColors']/*/*[@type='GdkColor*']" name="array">1</attr>
<attr path="/api/namespace/object[@cname='GdkColormap']/method[@name='FreeColors']/*/*[@type='const-GdkColor*']" name="array">1</attr>
<attr path="/api/namespace/object[@cname='GdkDevice']/field[@name='Name']" name="access">public</attr>
<attr path="/api/namespace/object[@cname='GdkDevice']/field[@name='Source']" name="access">public</attr>
<attr path="/api/namespace/object[@cname='GdkDevice']/field[@name='Mode']" name="access">public</attr>
@ -92,7 +92,6 @@
<attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='DrawRgb32ImageDithalign']/*/*[@name='buf']" name="array">1</attr>
<attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='DrawLines']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='DrawPoints']/*/*[@name='points']" name="array">1</attr>
<attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='DrawPoints']/*/*[@name='npoints']" name="name">n_points</attr>
<attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='DrawPolygon']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='GetSize']/*/*[@type='gint*']" name="pass_as">out</attr>
<attr path="/api/namespace/object[@cname='GdkDrawable']/method[@name='SetData']/*/*[@name='destroy_func']" name="type">gpointer</attr>
@ -197,7 +196,6 @@
<attr path="/api/namespace/struct[@cname='GdkRegion']/method[@name='GetClipbox']/*/*[@name='rectangle']" name="pass_as">out</attr>
<attr path="/api/namespace/struct[@cname='GdkRegion']/method[@name='GetRectangles']" name="hidden">1</attr>
<attr path="/api/namespace/struct[@cname='GdkRegion']/method[@name='Polygon']/*/*[@name='points']" name="array">1</attr>
<attr path="/api/namespace/struct[@cname='GdkRegion']/method[@name='Polygon']/*/*[@name='npoints']" name="name">n_points</attr>
<attr path="/api/namespace/struct[@cname='GdkRegion']/method[@name='SpansIntersectForeach']/*/*[@name='function']" name="scope">call</attr>
<attr path="/api/namespace/struct[@cname='GdkRgbCmap']/constructor/*/*[@name='colors']" name="array">1</attr>
<attr path="/api/namespace/struct[@cname='GdkRgbCmap']/field[@name='NColors']" name="writeable">false</attr>

View file

@ -8,9 +8,9 @@ endif
pkg = gdk
SYMBOLS = gdk-symbols.xml
INCLUDE_API = $(srcdir)/../glib/glib-api.xml ../pango/pango-api.xml
INCLUDE_API = $(srcdir)/../glib/glib-api.xml $(top_builddir)/gio/gio-api.xml $(top_builddir)/pango/pango-api.xml
METADATA = Gdk.metadata
references = ../glib/glib-sharp.dll ../pango/pango-sharp.dll $(local_mono_cairo)
references = $(top_builddir)/glib/glib-sharp.dll $(top_builddir)/gio/gio-sharp.dll $(top_builddir)/pango/pango-sharp.dll $(local_mono_cairo)
glue_includes = gdk/gdk.h
sources = \
@ -40,6 +40,7 @@ sources = \
customs = \
Atom.custom \
Color.custom \
Colormap.custom \
Device.custom \
DeviceAxis.custom \
Display.custom \

View file

@ -31,6 +31,9 @@
<member cname="GDK_CROSSING_NORMAL" name="Normal" />
<member cname="GDK_CROSSING_GRAB" name="Grab" />
<member cname="GDK_CROSSING_UNGRAB" name="Ungrab" />
<member cname="GDK_CROSSING_GTK_GRAB" name="GtkGrab" />
<member cname="GDK_CROSSING_GTK_UNGRAB" name="GtkUngrab" />
<member cname="GDK_CROSSING_STATE_CHANGED" name="StateChanged" />
</enum>
<enum name="CursorType" cname="GdkCursorType" gtype="gdk_cursor_type_get_type" type="enum">
<member cname="GDK_X_CURSOR" name="XCursor" />
@ -192,6 +195,7 @@
<member cname="GDK_SETTING" name="Setting" value="33" />
<member cname="GDK_OWNER_CHANGE" name="OwnerChange" value="34" />
<member cname="GDK_GRAB_BROKEN" name="GrabBroken" value="35" />
<member cname="GDK_DAMAGE" name="Damage" value="36" />
</enum>
<enum name="ExtensionMode" cname="GdkExtensionMode" gtype="gdk_extension_mode_get_type" type="enum">
<member cname="GDK_EXTENSION_EVENTS_NONE" name="None" />
@ -514,6 +518,49 @@
<parameter type="gpointer" name="data" />
</parameters>
</callback>
<object name="AppLaunchContext" cname="GdkAppLaunchContext" parent="GAppLaunchContext">
<field name="Priv" cname="priv" type="GdkAppLaunchContextPrivate*" />
<method name="GetType" cname="gdk_app_launch_context_get_type" shared="true">
<return-type type="GType" />
</method>
<constructor cname="gdk_app_launch_context_new" />
<method name="SetDesktop" cname="gdk_app_launch_context_set_desktop">
<return-type type="void" />
<parameters>
<parameter type="gint" name="desktop" />
</parameters>
</method>
<method name="SetDisplay" cname="gdk_app_launch_context_set_display">
<return-type type="void" />
<parameters>
<parameter type="GdkDisplay*" name="display" />
</parameters>
</method>
<method name="SetIcon" cname="gdk_app_launch_context_set_icon">
<return-type type="void" />
<parameters>
<parameter type="GIcon*" name="icon" />
</parameters>
</method>
<method name="SetIconName" cname="gdk_app_launch_context_set_icon_name">
<return-type type="void" />
<parameters>
<parameter type="const-char*" name="icon_name" />
</parameters>
</method>
<method name="SetScreen" cname="gdk_app_launch_context_set_screen">
<return-type type="void" />
<parameters>
<parameter type="GdkScreen*" name="screen" />
</parameters>
</method>
<method name="SetTimestamp" cname="gdk_app_launch_context_set_timestamp">
<return-type type="void" />
<parameters>
<parameter type="guint32" name="timestamp" />
</parameters>
</method>
</object>
<object name="Colormap" cname="GdkColormap" parent="GObject">
<field name="Size" cname="size" type="gint" access="public" />
<field name="Colors" cname="colors" type="GdkColor*" access="public" />
@ -531,7 +578,7 @@
<return-type type="gint" />
<parameters>
<parameter type="GdkColor*" name="colors" />
<parameter type="gint" name="ncolors" />
<parameter type="gint" name="n_colors" />
<parameter type="gboolean" name="writeable" />
<parameter type="gboolean" name="best_match" />
<parameter type="gboolean*" name="success" />
@ -546,8 +593,8 @@
<method name="FreeColors" cname="gdk_colormap_free_colors">
<return-type type="void" />
<parameters>
<parameter type="GdkColor*" name="colors" />
<parameter type="gint" name="ncolors" />
<parameter type="const-GdkColor*" name="colors" />
<parameter type="gint" name="n_colors" />
</parameters>
</method>
<method name="GetScreen" cname="gdk_colormap_get_screen">
@ -812,7 +859,7 @@
<method name="PutEvent" cname="gdk_display_put_event">
<return-type type="void" />
<parameters>
<parameter type="GdkEvent*" name="event" />
<parameter type="const-GdkEvent*" name="event" />
</parameters>
</method>
<method name="RequestSelectionNotification" cname="gdk_display_request_selection_notification">
@ -844,7 +891,7 @@
<parameters>
<parameter type="GdkWindow*" name="clipboard_window" />
<parameter type="guint32" name="time_" />
<parameter type="GdkAtom*" name="targets" />
<parameter type="const-GdkAtom*" name="targets" />
<parameter type="gint" name="n_targets" />
</parameters>
</method>
@ -882,7 +929,7 @@
</method>
</object>
<object name="DisplayManager" cname="GdkDisplayManager" parent="GObject">
<signal name="DisplayOpened" cname="display_opened" when="LAST" field_name="display_opened">
<signal name="DisplayOpened" cname="display-opened" when="LAST" field_name="display_opened">
<return-type type="void" />
<parameters>
<parameter type="GdkDisplayManager*" name="display_manager" />
@ -1236,7 +1283,7 @@
<return-type type="void" />
<parameters>
<parameter type="GdkGC*" name="gc" />
<parameter type="PangoMatrix*" name="matrix" />
<parameter type="const-PangoMatrix*" name="matrix" />
<parameter type="PangoFont*" name="font" />
<parameter type="gint" name="x" />
<parameter type="gint" name="y" />
@ -1252,7 +1299,7 @@
<parameter type="gint" name="width" />
<parameter type="gint" name="height" />
<parameter type="GdkRgbDither" name="dith" />
<parameter type="guchar*" name="buf" />
<parameter type="const-guchar*" name="buf" />
<parameter type="gint" name="rowstride" />
</parameters>
</method>
@ -1278,7 +1325,7 @@
<parameter type="gint" name="width" />
<parameter type="gint" name="height" />
<parameter type="GdkRgbDither" name="dith" />
<parameter type="guchar*" name="buf" />
<parameter type="const-guchar*" name="buf" />
<parameter type="gint" name="rowstride" />
<parameter type="GdkRgbCmap*" name="cmap" />
</parameters>
@ -1337,15 +1384,15 @@
<return-type type="void" />
<parameters>
<parameter type="GdkGC*" name="gc" />
<parameter type="GdkPoint*" name="points" />
<parameter type="gint" name="npoints" />
<parameter type="const-GdkPoint*" name="points" />
<parameter type="gint" name="n_points" />
</parameters>
</method>
<method name="DrawPixbuf" cname="gdk_draw_pixbuf">
<return-type type="void" />
<parameters>
<parameter type="GdkGC*" name="gc" />
<parameter type="GdkPixbuf*" name="pixbuf" />
<parameter type="const-GdkPixbuf*" name="pixbuf" />
<parameter type="gint" name="src_x" />
<parameter type="gint" name="src_y" />
<parameter type="gint" name="dest_x" />
@ -1369,8 +1416,8 @@
<return-type type="void" />
<parameters>
<parameter type="GdkGC*" name="gc" />
<parameter type="GdkPoint*" name="points" />
<parameter type="gint" name="npoints" />
<parameter type="const-GdkPoint*" name="points" />
<parameter type="gint" name="n_points" />
</parameters>
</method>
<method name="DrawPolygon" cname="gdk_draw_polygon">
@ -1378,8 +1425,8 @@
<parameters>
<parameter type="GdkGC*" name="gc" />
<parameter type="gboolean" name="filled" />
<parameter type="GdkPoint*" name="points" />
<parameter type="gint" name="npoints" />
<parameter type="const-GdkPoint*" name="points" />
<parameter type="gint" name="n_points" />
</parameters>
</method>
<method name="DrawRectangle" cname="gdk_draw_rectangle">
@ -1402,7 +1449,7 @@
<parameter type="gint" name="width" />
<parameter type="gint" name="height" />
<parameter type="GdkRgbDither" name="dith" />
<parameter type="guchar*" name="buf" />
<parameter type="const-guchar*" name="buf" />
<parameter type="gint" name="rowstride" />
</parameters>
</method>
@ -1415,7 +1462,7 @@
<parameter type="gint" name="width" />
<parameter type="gint" name="height" />
<parameter type="GdkRgbDither" name="dith" />
<parameter type="guchar*" name="buf" />
<parameter type="const-guchar*" name="buf" />
<parameter type="gint" name="rowstride" />
<parameter type="gint" name="xdith" />
<parameter type="gint" name="ydith" />
@ -1430,7 +1477,7 @@
<parameter type="gint" name="width" />
<parameter type="gint" name="height" />
<parameter type="GdkRgbDither" name="dith" />
<parameter type="guchar*" name="rgb_buf" />
<parameter type="const-guchar*" name="rgb_buf" />
<parameter type="gint" name="rowstride" />
</parameters>
</method>
@ -1443,7 +1490,7 @@
<parameter type="gint" name="width" />
<parameter type="gint" name="height" />
<parameter type="GdkRgbDither" name="dith" />
<parameter type="guchar*" name="rgb_buf" />
<parameter type="const-guchar*" name="rgb_buf" />
<parameter type="gint" name="rowstride" />
<parameter type="gint" name="xdith" />
<parameter type="gint" name="ydith" />
@ -1453,8 +1500,8 @@
<return-type type="void" />
<parameters>
<parameter type="GdkGC*" name="gc" />
<parameter type="GdkSegment*" name="segs" />
<parameter type="gint" name="nsegs" />
<parameter type="const-GdkSegment*" name="segs" />
<parameter type="gint" name="n_segs" />
</parameters>
</method>
<method name="DrawString" cname="gdk_draw_string" deprecated="1">
@ -1493,7 +1540,7 @@
<return-type type="void" />
<parameters>
<parameter type="GdkGC*" name="gc" />
<parameter type="GdkTrapezoid*" name="trapezoids" />
<parameter type="const-GdkTrapezoid*" name="trapezoids" />
<parameter type="gint" name="n_trapezoids" />
</parameters>
</method>
@ -1671,13 +1718,13 @@
<method name="SetClipRectangle" cname="gdk_gc_set_clip_rectangle">
<return-type type="void" />
<parameters>
<parameter type="GdkRectangle*" name="rectangle" />
<parameter type="const-GdkRectangle*" name="rectangle" />
</parameters>
</method>
<method name="SetClipRegion" cname="gdk_gc_set_clip_region">
<return-type type="void" />
<parameters>
<parameter type="GdkRegion*" name="region" />
<parameter type="const-GdkRegion*" name="region" />
</parameters>
</method>
<method name="SetColormap" cname="gdk_gc_set_colormap">
@ -1848,13 +1895,13 @@
</object>
<object name="Keymap" cname="GdkKeymap" parent="GObject">
<field name="Display" cname="display" type="GdkDisplay*" />
<signal name="DirectionChanged" cname="direction_changed" when="LAST" field_name="direction_changed">
<signal name="DirectionChanged" cname="direction-changed" when="LAST" field_name="direction_changed">
<return-type type="void" />
<parameters>
<parameter type="GdkKeymap*" name="keymap" />
</parameters>
</signal>
<signal name="KeysChanged" cname="keys_changed" when="LAST" field_name="keys_changed">
<signal name="KeysChanged" cname="keys-changed" when="LAST" field_name="keys_changed">
<return-type type="void" />
<parameters>
<parameter type="GdkKeymap*" name="keymap" />
@ -2065,13 +2112,19 @@
<field name="Resolution" cname="resolution" type="double" />
<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">
<signal name="SizeChanged" cname="size-changed" when="LAST" field_name="size_changed">
<return-type type="void" />
<parameters>
<parameter type="GdkScreen*" name="screen" />
</parameters>
</signal>
<signal name="CompositedChanged" cname="composited_changed" when="LAST" field_name="composited_changed">
<signal name="CompositedChanged" cname="composited-changed" when="LAST" field_name="composited_changed">
<return-type type="void" />
<parameters>
<parameter type="GdkScreen*" name="screen" />
</parameters>
</signal>
<signal name="MonitorsChanged" cname="monitors-changed" when="LAST" field_name="monitors_changed">
<return-type type="void" />
<parameters>
<parameter type="GdkScreen*" name="screen" />
@ -2124,6 +2177,24 @@
<parameter type="GdkRectangle*" name="dest" />
</parameters>
</method>
<method name="GetMonitorHeightMm" cname="gdk_screen_get_monitor_height_mm">
<return-type type="gint" />
<parameters>
<parameter type="gint" name="monitor_num" />
</parameters>
</method>
<method name="GetMonitorPlugName" cname="gdk_screen_get_monitor_plug_name">
<return-type type="gchar*" />
<parameters>
<parameter type="gint" name="monitor_num" />
</parameters>
</method>
<method name="GetMonitorWidthMm" cname="gdk_screen_get_monitor_width_mm">
<return-type type="gint" />
<parameters>
<parameter type="gint" name="monitor_num" />
</parameters>
</method>
<method name="GetNMonitors" cname="gdk_screen_get_n_monitors">
<return-type type="gint" />
</method>
@ -2299,13 +2370,13 @@
<method name="BeginPaintRect" cname="gdk_window_begin_paint_rect">
<return-type type="void" />
<parameters>
<parameter type="GdkRectangle*" name="rectangle" />
<parameter type="const-GdkRectangle*" name="rectangle" />
</parameters>
</method>
<method name="BeginPaintRegion" cname="gdk_window_begin_paint_region">
<return-type type="void" />
<parameters>
<parameter type="GdkRegion*" name="region" />
<parameter type="const-GdkRegion*" name="region" />
</parameters>
</method>
<method name="BeginResizeDrag" cname="gdk_window_begin_resize_drag">
@ -2512,7 +2583,7 @@
<method name="InputShapeCombineRegion" cname="gdk_window_input_shape_combine_region">
<return-type type="void" />
<parameters>
<parameter type="GdkRegion*" name="shape_region" />
<parameter type="const-GdkRegion*" name="shape_region" />
<parameter type="gint" name="offset_x" />
<parameter type="gint" name="offset_y" />
</parameters>
@ -2520,7 +2591,7 @@
<method name="InvalidateMaybeRecurse" cname="gdk_window_invalidate_maybe_recurse">
<return-type type="void" />
<parameters>
<parameter type="GdkRegion*" name="region" />
<parameter type="const-GdkRegion*" name="region" />
<parameter type="InvalidateMaybeRecurseChildFunc" name="child_func" />
<parameter type="gpointer" name="user_data" />
</parameters>
@ -2528,14 +2599,14 @@
<method name="InvalidateRect" cname="gdk_window_invalidate_rect">
<return-type type="void" />
<parameters>
<parameter type="GdkRectangle*" name="rect" />
<parameter type="const-GdkRectangle*" name="rect" />
<parameter type="gboolean" name="invalidate_children" />
</parameters>
</method>
<method name="InvalidateRegion" cname="gdk_window_invalidate_region">
<return-type type="void" />
<parameters>
<parameter type="GdkRegion*" name="region" />
<parameter type="const-GdkRegion*" name="region" />
<parameter type="gboolean" name="invalidate_children" />
</parameters>
</method>
@ -2580,7 +2651,7 @@
<method name="MoveRegion" cname="gdk_window_move_region">
<return-type type="void" />
<parameters>
<parameter type="GdkRegion*" name="region" />
<parameter type="const-GdkRegion*" name="region" />
<parameter type="gint" name="dx" />
<parameter type="gint" name="dy" />
</parameters>
@ -2626,6 +2697,9 @@
<parameter type="gpointer" name="data" />
</parameters>
</method>
<method name="RemoveRedirection" cname="gdk_window_remove_redirection">
<return-type type="void" />
</method>
<method name="Reparent" cname="gdk_window_reparent">
<return-type type="void" />
<parameters>
@ -2718,7 +2792,7 @@
<method name="SetGeometryHints" cname="gdk_window_set_geometry_hints">
<return-type type="void" />
<parameters>
<parameter type="GdkGeometry*" name="geometry" />
<parameter type="const-GdkGeometry*" name="geometry" />
<parameter type="GdkWindowHints" name="geom_mask" />
</parameters>
</method>
@ -2861,7 +2935,7 @@
<method name="ShapeCombineRegion" cname="gdk_window_shape_combine_region">
<return-type type="void" />
<parameters>
<parameter type="GdkRegion*" name="shape_region" />
<parameter type="const-GdkRegion*" name="shape_region" />
<parameter type="gint" name="offset_x" />
<parameter type="gint" name="offset_y" />
</parameters>
@ -3399,14 +3473,14 @@
<method name="Intersect" cname="gdk_rectangle_intersect">
<return-type type="gboolean" />
<parameters>
<parameter type="GdkRectangle*" name="src2" />
<parameter type="const-GdkRectangle*" name="src2" />
<parameter type="GdkRectangle*" name="dest" />
</parameters>
</method>
<method name="Union" cname="gdk_rectangle_union">
<return-type type="void" />
<parameters>
<parameter type="GdkRectangle*" name="src2" />
<parameter type="const-GdkRectangle*" name="src2" />
<parameter type="GdkRectangle*" name="dest" />
</parameters>
</method>
@ -3428,7 +3502,7 @@
<method name="Equal" cname="gdk_region_equal">
<return-type type="gboolean" />
<parameters>
<parameter type="GdkRegion*" name="region2" />
<parameter type="const-GdkRegion*" name="region2" />
</parameters>
</method>
<method name="GetClipbox" cname="gdk_region_get_clipbox">
@ -3447,7 +3521,7 @@
<method name="Intersect" cname="gdk_region_intersect">
<return-type type="void" />
<parameters>
<parameter type="GdkRegion*" name="source2" />
<parameter type="const-GdkRegion*" name="source2" />
</parameters>
</method>
<constructor cname="gdk_region_new" />
@ -3468,21 +3542,21 @@
<method name="Polygon" cname="gdk_region_polygon" shared="true">
<return-type type="GdkRegion*" />
<parameters>
<parameter type="GdkPoint*" name="points" />
<parameter type="gint" name="npoints" />
<parameter type="const-GdkPoint*" name="points" />
<parameter type="gint" name="n_points" />
<parameter type="GdkFillRule" name="fill_rule" />
</parameters>
</method>
<method name="RectIn" cname="gdk_region_rect_in">
<return-type type="GdkOverlapType" />
<parameters>
<parameter type="GdkRectangle*" name="rectangle" />
<parameter type="const-GdkRectangle*" name="rectangle" />
</parameters>
</method>
<method name="Rectangle" cname="gdk_region_rectangle" shared="true">
<return-type type="GdkRegion*" />
<parameters>
<parameter type="GdkRectangle*" name="rectangle" />
<parameter type="const-GdkRectangle*" name="rectangle" />
</parameters>
</method>
<method name="Shrink" cname="gdk_region_shrink">
@ -3495,7 +3569,7 @@
<method name="SpansIntersectForeach" cname="gdk_region_spans_intersect_foreach">
<return-type type="void" />
<parameters>
<parameter type="GdkSpan*" name="spans" />
<parameter type="const-GdkSpan*" name="spans" />
<parameter type="int" name="n_spans" />
<parameter type="gboolean" name="sorted" />
<parameter type="GdkSpanFunc" name="function" />
@ -3505,25 +3579,25 @@
<method name="Subtract" cname="gdk_region_subtract">
<return-type type="void" />
<parameters>
<parameter type="GdkRegion*" name="source2" />
<parameter type="const-GdkRegion*" name="source2" />
</parameters>
</method>
<method name="Union" cname="gdk_region_union">
<return-type type="void" />
<parameters>
<parameter type="GdkRegion*" name="source2" />
<parameter type="const-GdkRegion*" name="source2" />
</parameters>
</method>
<method name="UnionWithRect" cname="gdk_region_union_with_rect">
<return-type type="void" />
<parameters>
<parameter type="GdkRectangle*" name="rect" />
<parameter type="const-GdkRectangle*" name="rect" />
</parameters>
</method>
<method name="Xor" cname="gdk_region_xor">
<return-type type="void" />
<parameters>
<parameter type="GdkRegion*" name="source2" />
<parameter type="const-GdkRegion*" name="source2" />
</parameters>
</method>
</struct>
@ -3620,10 +3694,26 @@
<field name="Shaped" cname="shaped" bits="1" type="guint" />
<field name="EventMask" cname="event_mask" type="GdkEventMask" />
<field name="UpdateAndDescendantsFreezeCount" cname="update_and_descendants_freeze_count" type="guint" />
<field name="Redirect" cname="redirect" type="GdkWindowRedirect*" />
<method name="GetType" cname="gdk_window_object_get_type" shared="true">
<return-type type="GType" />
</method>
</struct>
<struct name="WindowRedirect" cname="GdkWindowRedirect" opaque="true">
<method name="ToDrawable" cname="gdk_window_redirect_to_drawable" shared="true">
<return-type type="void" />
<parameters>
<parameter type="GdkWindow*" name="window" />
<parameter type="GdkDrawable*" name="drawable" />
<parameter type="gint" name="src_x" />
<parameter type="gint" name="src_y" />
<parameter type="gint" name="dest_x" />
<parameter type="gint" name="dest_y" />
<parameter type="gint" name="width" />
<parameter type="gint" name="height" />
</parameters>
</method>
</struct>
<alias name="XEvent" cname="GdkXEvent" type="void" />
<struct name="POINTBLOCK" cname="POINTBLOCK" opaque="true" />
<struct name="ScanLineList" cname="ScanLineList" opaque="true" />
@ -3842,28 +3932,28 @@
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="GdkRectangle*" name="rectangle" />
<parameter type="const-GdkRectangle*" name="rectangle" />
</parameters>
</method>
<method name="Region" cname="gdk_cairo_region" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="GdkRegion*" name="region" />
<parameter type="const-GdkRegion*" name="region" />
</parameters>
</method>
<method name="SetSourceColor" cname="gdk_cairo_set_source_color" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="GdkColor*" name="color" />
<parameter type="const-GdkColor*" name="color" />
</parameters>
</method>
<method name="SetSourcePixbuf" cname="gdk_cairo_set_source_pixbuf" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="GdkPixbuf*" name="pixbuf" />
<parameter type="const-GdkPixbuf*" name="pixbuf" />
<parameter type="double" name="pixbuf_x" />
<parameter type="double" name="pixbuf_y" />
</parameters>
@ -3990,17 +4080,17 @@
</parameters>
</method>
<method name="GetProtocol" cname="gdk_drag_get_protocol" shared="true">
<return-type type="guint32" />
<return-type type="GdkNativeWindow" />
<parameters>
<parameter type="guint32" name="xid" />
<parameter type="GdkNativeWindow" name="xid" />
<parameter type="GdkDragProtocol*" name="protocol" />
</parameters>
</method>
<method name="GetProtocolForDisplay" cname="gdk_drag_get_protocol_for_display" shared="true">
<return-type type="guint32" />
<return-type type="GdkNativeWindow" />
<parameters>
<parameter type="GdkDisplay*" name="display" />
<parameter type="guint32" name="xid" />
<parameter type="GdkNativeWindow" name="xid" />
<parameter type="GdkDragProtocol*" name="protocol" />
</parameters>
</method>
@ -4062,7 +4152,7 @@
<method name="Copy" cname="gdk_event_copy" shared="true">
<return-type type="GdkEvent*" owned="true" />
<parameters>
<parameter type="GdkEvent*" name="event" />
<parameter type="const-GdkEvent*" name="event" />
</parameters>
</method>
<method name="Free" cname="gdk_event_free" shared="true">
@ -4077,7 +4167,7 @@
<method name="GetAxis" cname="gdk_event_get_axis" shared="true">
<return-type type="gboolean" />
<parameters>
<parameter type="GdkEvent*" name="event" />
<parameter type="const-GdkEvent*" name="event" />
<parameter type="GdkAxisUse" name="axis_use" />
<parameter type="gdouble*" name="value" />
</parameters>
@ -4085,7 +4175,7 @@
<method name="GetCoords" cname="gdk_event_get_coords" shared="true">
<return-type type="gboolean" />
<parameters>
<parameter type="GdkEvent*" name="event" />
<parameter type="const-GdkEvent*" name="event" />
<parameter type="gdouble*" name="x_win" />
<parameter type="gdouble*" name="y_win" />
</parameters>
@ -4099,7 +4189,7 @@
<method name="GetRootCoords" cname="gdk_event_get_root_coords" shared="true">
<return-type type="gboolean" />
<parameters>
<parameter type="GdkEvent*" name="event" />
<parameter type="const-GdkEvent*" name="event" />
<parameter type="gdouble*" name="x_root" />
<parameter type="gdouble*" name="y_root" />
</parameters>
@ -4107,20 +4197,20 @@
<method name="GetScreen" cname="gdk_event_get_screen" shared="true">
<return-type type="GdkScreen*" />
<parameters>
<parameter type="GdkEvent*" name="event" />
<parameter type="const-GdkEvent*" name="event" />
</parameters>
</method>
<method name="GetState" cname="gdk_event_get_state" shared="true">
<return-type type="gboolean" />
<parameters>
<parameter type="GdkEvent*" name="event" />
<parameter type="const-GdkEvent*" name="event" />
<parameter type="GdkModifierType*" name="state" />
</parameters>
</method>
<method name="GetTime" cname="gdk_event_get_time" shared="true">
<return-type type="guint32" />
<parameters>
<parameter type="GdkEvent*" name="event" />
<parameter type="const-GdkEvent*" name="event" />
</parameters>
</method>
<method name="GetType" cname="gdk_event_get_type" shared="true">
@ -4146,13 +4236,13 @@
<method name="Put" cname="gdk_event_put" shared="true">
<return-type type="void" />
<parameters>
<parameter type="GdkEvent*" name="event" />
<parameter type="const-GdkEvent*" name="event" />
</parameters>
</method>
<method name="RequestMotions" cname="gdk_event_request_motions" shared="true">
<return-type type="void" />
<parameters>
<parameter type="GdkEventMotion*" name="event" />
<parameter type="const-GdkEventMotion*" name="event" />
</parameters>
</method>
<method name="SendClientMessage" cname="gdk_event_send_client_message" shared="true">
@ -4216,7 +4306,7 @@
<parameter type="GdkInputCondition" name="condition" />
<parameter type="GdkInputFunction" name="function" />
<parameter type="gpointer" name="data" />
<parameter type="GdkDestroyNotify" name="destroy" />
<parameter type="GDestroyNotify" name="destroy" />
</parameters>
</method>
<method name="Remove" cname="gdk_input_remove" deprecated="1" shared="true">
@ -4344,7 +4434,7 @@
<parameter type="PangoLayout*" name="layout" />
<parameter type="gint" name="x_origin" />
<parameter type="gint" name="y_origin" />
<parameter type="gint*" name="index_ranges" />
<parameter type="const-gint*" name="index_ranges" />
<parameter type="gint" name="n_ranges" />
</parameters>
</method>
@ -4354,7 +4444,7 @@
<parameter type="PangoLayoutLine*" name="line" />
<parameter type="gint" name="x_origin" />
<parameter type="gint" name="y_origin" />
<parameter type="gint*" name="index_ranges" />
<parameter type="const-gint*" name="index_ranges" />
<parameter type="gint" name="n_ranges" />
</parameters>
</method>
@ -4658,7 +4748,7 @@
<method name="SendNotify" cname="gdk_selection_send_notify" shared="true">
<return-type type="void" />
<parameters>
<parameter type="guint32" name="requestor" />
<parameter type="GdkNativeWindow" name="requestor" />
<parameter type="GdkAtom" name="selection" />
<parameter type="GdkAtom" name="target" />
<parameter type="GdkAtom" name="property" />
@ -4669,7 +4759,7 @@
<return-type type="void" />
<parameters>
<parameter type="GdkDisplay*" name="display" />
<parameter type="guint32" name="requestor" />
<parameter type="GdkNativeWindow" name="requestor" />
<parameter type="GdkAtom" name="selection" />
<parameter type="GdkAtom" name="target" />
<parameter type="GdkAtom" name="property" />
@ -4855,6 +4945,24 @@
<parameter type="GDestroyNotify" name="notify" />
</parameters>
</method>
<method name="AddTimeoutSeconds" cname="gdk_threads_add_timeout_seconds" shared="true">
<return-type type="guint" />
<parameters>
<parameter type="guint" name="interval" />
<parameter type="GSourceFunc" name="function" />
<parameter type="gpointer" name="data" />
</parameters>
</method>
<method name="AddTimeoutSecondsFull" cname="gdk_threads_add_timeout_seconds_full" shared="true">
<return-type type="guint" />
<parameters>
<parameter type="gint" name="priority" />
<parameter type="guint" name="interval" />
<parameter type="GSourceFunc" name="function" />
<parameter type="gpointer" name="data" />
<parameter type="GDestroyNotify" name="notify" />
</parameters>
</method>
<method name="Enter" cname="gdk_threads_enter" shared="true">
<return-type type="void" />
</method>
@ -5147,6 +5255,23 @@
<parameter type="GError**" name="error" />
</parameters>
</constructor>
<constructor cname="gdk_pixbuf_new_from_stream">
<parameters>
<parameter type="GInputStream*" name="stream" />
<parameter type="GCancellable*" name="cancellable" />
<parameter type="GError**" name="error" />
</parameters>
</constructor>
<constructor cname="gdk_pixbuf_new_from_stream_at_scale">
<parameters>
<parameter type="GInputStream*" name="stream" />
<parameter type="gint" name="width" />
<parameter type="gint" name="height" />
<parameter type="gboolean" name="preserve_aspect_ratio" />
<parameter type="GCancellable*" name="cancellable" />
<parameter type="GError**" name="error" />
</parameters>
</constructor>
<constructor cname="gdk_pixbuf_new_from_xpm_data">
<parameters>
<parameter type="const-char**" name="data" />
@ -5229,6 +5354,16 @@
<parameter type="GError**" name="error" />
</parameters>
</method>
<method name="SaveToStream" cname="gdk_pixbuf_save_to_stream">
<return-type type="gboolean" />
<parameters>
<parameter type="GOutputStream*" name="stream" />
<parameter type="const-char*" name="type" />
<parameter type="GCancellable*" name="cancellable" />
<parameter type="GError**" name="error" />
<parameter ellipsis="true" />
</parameters>
</method>
<method name="Savev" cname="gdk_pixbuf_savev">
<return-type type="gboolean" />
<parameters>
@ -5379,7 +5514,7 @@
</object>
<object name="PixbufLoader" cname="GdkPixbufLoader" parent="GObject">
<field name="Priv" cname="priv" type="gpointer" />
<signal name="SizePrepared" cname="size_prepared" when="LAST" field_name="size_prepared">
<signal name="SizePrepared" cname="size-prepared" when="LAST" field_name="size_prepared">
<return-type type="void" />
<parameters>
<parameter type="GdkPixbufLoader*" name="loader" />
@ -5387,13 +5522,13 @@
<parameter type="int" name="height" />
</parameters>
</signal>
<signal name="AreaPrepared" cname="area_prepared" when="LAST" field_name="area_prepared">
<signal name="AreaPrepared" cname="area-prepared" when="LAST" field_name="area_prepared">
<return-type type="void" />
<parameters>
<parameter type="GdkPixbufLoader*" name="loader" />
</parameters>
</signal>
<signal name="AreaUpdated" cname="area_updated" when="LAST" field_name="area_updated">
<signal name="AreaUpdated" cname="area-updated" when="LAST" field_name="area_updated">
<return-type type="void" />
<parameters>
<parameter type="GdkPixbufLoader*" name="loader" />

View file

@ -32,6 +32,7 @@ namespace GtkSharp.Generation {
public override void Generate (GenerationInfo gen_info)
{
Method copy = methods["Copy"] as Method;
Method free = methods["Free"] as Method;
methods.Remove ("Copy");
methods.Remove ("Free");
@ -62,6 +63,14 @@ namespace GtkSharp.Generation {
sw.WriteLine ("\t\t}");
}
if (free != null && free.IsDeprecated) {
sw.WriteLine ();
sw.WriteLine ("\t\t[Obsolete(\"This is a no-op\")]");
sw.WriteLine ("\t\tpublic " + QualifiedName + " Free () {");
sw.WriteLine ("\t\t\treturn this;");
sw.WriteLine ("\t\t}");
}
sw.WriteLine ("#endregion");
AppendCustom(sw, gen_info.CustomDir);
sw.WriteLine ("\t}");

View file

@ -62,7 +62,11 @@ namespace GtkSharp.Generation {
protected string cstype;
public string CSType {
get {
if (cstype == null)
if (Getter != null)
return Getter.Signature.IsAccessor ? Getter.Signature.AccessorType : Getter.ReturnType;
else if (Setter != null)
return Setter.Signature.Types;
else if (cstype == null)
cstype = SymbolTable.Table.GetCSType (CType);
return cstype;
}
@ -80,33 +84,23 @@ namespace GtkSharp.Generation {
}
}
Method getter;
protected Method Getter {
get {
if (getter == null) {
getter = container_type.GetMethod ("Get" + Name);
if (getter != null && getter.Name == "Get" + Name &&
getter.IsGetter)
cstype = getter.ReturnType;
else
getter = null;
}
Method getter = container_type.GetMethod ("Get" + Name);
if (getter != null && getter.Name == "Get" + Name && getter.IsGetter)
return getter;
else
return null;
}
}
Method setter;
protected Method Setter {
get {
if (setter == null) {
setter = container_type.GetMethod ("Set" + Name);
if (setter != null && setter.Name == "Set" + Name &&
setter.IsSetter)
cstype = setter.Signature.Types;
else
setter = null;
}
Method setter = container_type.GetMethod ("Set" + Name);
if (setter != null && setter.Name == "Set" + Name && setter.IsSetter && (Getter == null || setter.Signature.Types == CSType))
return setter;
else
return null;
}
}

31
gio/File.custom Normal file
View file

@ -0,0 +1,31 @@
// File.custom - customizations to GLib.File
//
// Authors: Stephane Delcroix <stephane@delcroix.org>
//
// Copyright (c) 2008 Novell, Inc.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of version 2 of the Lesser GNU General
// Public License as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this program; if not, write to the
// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA.
bool Exists
{
get;
}
System.Uri Uri
{
get;
}
bool Delete();

46
gio/FileAdapter.custom Normal file
View file

@ -0,0 +1,46 @@
// FileAdapter.custom - customizations to GLib.FileAdapter
//
// Authors: Stephane Delcroix <stephane@delcroix.org>
//
// Copyright (c) 2008 Novell, Inc.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of version 2 of the Lesser GNU General
// Public License as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this program; if not, write to the
// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA.
public override string ToString ()
{
return Uri.ToString ();
}
public bool Exists {
get { return QueryExists (null); }
}
public bool Delete ()
{
return Delete (null);
}
[DllImport("gio")]
static extern IntPtr g_file_get_uri(IntPtr raw);
public System.Uri Uri {
get {
IntPtr raw_ret = g_file_get_uri(Handle);
string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
return new System.Uri (ret);
}
}

59
gio/FileEnumerator.custom Normal file
View file

@ -0,0 +1,59 @@
// FileEnumerator.custom - customizations to GLib.FileEnumerator
//
// Authors: Stephane Delcroix <stephane@delcroix.org>
//
// Copyright (c) 2008 Novell, Inc.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of version 2 of the Lesser GNU General
// Public License as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this program; if not, write to the
// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA.
public IEnumerator GetEnumerator ()
{
return new Enumerator (this);
}
public FileInfo NextFile ()
{
return NextFile ((Cancellable) null);
}
class Enumerator : IEnumerator
{
FileEnumerator file_enumerator;
public Enumerator (FileEnumerator file_enumerator)
{
this.file_enumerator = file_enumerator;
}
FileInfo current=null;
public object Current {
get {
return current;
}
}
public bool MoveNext ()
{
current = file_enumerator.NextFile ();
if (current == null)
return false;
return true;
}
public void Reset ()
{
throw new NotImplementedException ();
}
}

59
gio/FileFactory.cs Normal file
View file

@ -0,0 +1,59 @@
//
// FileFactory.cs
//
// Author(s):
// Stephane Delcroix <stephane@delcroix.org>
//
// Copyright (c) 2008 Stephane Delcroix
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of version 2 of the Lesser GNU General
// Public License as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this program; if not, write to the
// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA.
using System;
using System.Runtime.InteropServices;
namespace GLib
{
public class FileFactory
{
[DllImport ("libgio-2.0-0.dll")]
private static extern IntPtr g_file_new_for_uri (string uri);
public static File NewForUri (string uri)
{
return GLib.FileAdapter.GetObject (g_file_new_for_uri (uri), false) as File;
}
public static File NewForUri (Uri uri)
{
return GLib.FileAdapter.GetObject (g_file_new_for_uri (uri.ToString ()), false) as File;
}
[DllImport ("libgio-2.0-0.dll")]
private static extern IntPtr g_file_new_for_path (string path);
public static File NewForPath (string path)
{
return GLib.FileAdapter.GetObject (g_file_new_for_path (path), false) as File;
}
[DllImport ("libgio-2.0-0.dll")]
private static extern IntPtr g_file_new_for_commandline_args (string args);
public static File NewForCommandlineArgs (string args)
{
return GLib.FileAdapter.GetObject (g_file_new_for_commandline_args (args), false) as File;
}
}
}

45
gio/Gio.metadata Normal file
View file

@ -0,0 +1,45 @@
<?xml version="1.0"?>
<metadata>
<add-node path="/api"><symbol type="simple" cname="GSeekType" name="GLib.SeekType"/></add-node>
<attr path="/api/namespace" name="name">GLib</attr>
<attr path="/api/namespace/interface[@cname='GFile']/method[@name='GetParseName']" name="name">GetParsedName</attr>
<attr path="/api/namespace/interface[@cname='GLoadableIcon']/method[@name='LoadAsync']/*/*[@type='GAsyncReadyCallback']" name="scope">async</attr>
<attr path="/api/namespace/interface[@cname='GVolume']/method[@name='GetMount']" name="name">GetMountInstance</attr>
<attr path="/api/namespace/object/method/*/*[@type='GAsyncReadyCallback']" name="scope">async</attr>
<add-node path="/api/namespace/object[@cname='GFileEnumerator']"><implements><interface name="IEnumerable" /></implements></add-node>
<attr path="/api/namespace/object[@cname='GInputStream']/method[@cname='g_input_stream_read']/parameters/parameter[@name='buffer']" name="type">guchar*</attr>
<attr path="/api/namespace/object[@cname='GInputStream']/method[@cname='g_input_stream_read']/parameters/parameter[@name='buffer']" name="array">1</attr>
<attr path="/api/namespace/object[@cname='GInputStream']/method[@cname='g_input_stream_read_all']/parameters/parameter[@name='buffer']" name="type">guchar*</attr>
<attr path="/api/namespace/object[@cname='GInputStream']/method[@cname='g_input_stream_read_all']/parameters/parameter[@name='buffer']" name="array">1</attr>
<attr path="/api/namespace/object[@cname='GInputStream']/method[@cname='g_input_stream_read_async']/parameters/parameter[@name='buffer']" name="type">guchar*</attr>
<attr path="/api/namespace/object[@cname='GInputStream']/method[@cname='g_input_stream_read_async']/parameters/parameter[@name='buffer']" name="array">1</attr>
<attr path="/api/namespace/object[@cname='GOutputStream']/method[@cname='g_output_stream_write']/parameters/parameter[@name='buffer']" name="type">guchar*</attr>
<attr path="/api/namespace/object[@cname='GOutputStream']/method[@cname='g_output_stream_write']/parameters/parameter[@name='buffer']" name="array">1</attr>
<attr path="/api/namespace/object[@cname='GOutputStream']/method[@cname='g_output_stream_write_all']/parameters/parameter[@name='buffer']" name="type">guchar*</attr>
<attr path="/api/namespace/object[@cname='GOutputStream']/method[@cname='g_output_stream_write_all']/parameters/parameter[@name='buffer']" name="array">1</attr>
<attr path="/api/namespace/object[@cname='GOutputStream']/method[@cname='g_output_stream_write_async']/parameters/parameter[@name='buffer']" name="type">guchar*</attr>
<attr path="/api/namespace/object[@cname='GOutputStream']/method[@cname='g_output_stream_write_async']/parameters/parameter[@name='buffer']" name="array">1</attr>
<attr path="/api/namespace/object[@cname='GMemoryOutputStream']/method[@name='GetData']" name="new_flag">1</attr>
<attr path="/api/namespace/object[@cname='GMountOperation']/method[@name='Reply']" name="name">EmitReply</attr>
<attr path="/api/namespace/object[@cname='GSimpleAsyncResult']/constructor[@cname='g_simple_async_result_new_error']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GSimpleAsyncResult']/method[@name='SetError']" name="hidden">1</attr>
<attr path="/api/namespace/interface[@cname='GFile']/method[@name='GetUri']" name="hidden">1</attr>
<attr path="/api/namespace/interface[@cname='GAppInfo']/method[@name='GetAllForType']/return-type" name="element_type">GAppInfo*</attr>
<attr path="/api/namespace/interface[@cname='GAppInfo']/method[@name='GetAllForType']/return-type" name="owned">true</attr>
<!-- <attr path="/api/namespace/interface[@cname='GAppInfo']/method[@name='GetAllForType']/return-type" name="elements_owned">true</attr>-->
<attr path="/api/namespace/interface[@cname='GAppInfo']/method[@name='All']/return-type" name="element_type">GAppInfo*</attr>
<attr path="/api/namespace/interface[@cname='GAppInfo']/method[@name='All']/return-type" name="owned">true</attr>
<attr path="/api/namespace/interface[@cname='GAppInfo']/method[@name='All']/return-type" name="elements_owned">true</attr>
<attr path="/api/namespace/object[@cname='GThemedIcon']/method[@name='GetNames']/return-type" name="null_term_array">1</attr>
<attr path="/api/namespace/interface[@cname='GSeekable']/method[@cname='g_seekable_can_seek']" name="name">GetCanSeek</attr>
<attr path="/api/namespace/interface[@cname='GSeekable']/method[@cname='g_seekable_tell']" name="name">GetPosition</attr>
<attr path="/api/namespace/object[@cname='GFileInfo']/method[@cname='g_file_info_get_attribute_int64']" name="name">GetAttributeLong</attr>
<attr path="/api/namespace/object[@cname='GFileInfo']/method[@cname='g_file_info_set_attribute_int64']" name="name">SetAttributeLong</attr>
<attr path="/api/namespace/object[@cname='GFileInfo']/method[@cname='g_file_info_get_attribute_uint64']" name="name">GetAttributeULong</attr>
<attr path="/api/namespace/object[@cname='GFileInfo']/method[@cname='g_file_info_set_attribute_uint64']" name="name">SetAttributeULong</attr>
<attr path="/api/namespace/object[@cname='GFileInfo']/method[@cname='g_file_info_get_attribute_int32']" name="name">GetAttributeInt</attr>
<attr path="/api/namespace/object[@cname='GFileInfo']/method[@cname='g_file_info_set_attribute_int32']" name="name">SetAttributeInt</attr>
<attr path="/api/namespace/object[@cname='GFileInfo']/method[@cname='g_file_info_get_attribute_uint32']" name="name">GetAttributeUInt</attr>
<attr path="/api/namespace/object[@cname='GFileInfo']/method[@cname='g_file_info_set_attribute_uint32']" name="name">SetAttributeUInt</attr>
<attr path="/api/namespace/struct[@cname='GFileAttributeInfoList']/field[@name='Infos']" name="array">1</attr>
</metadata>

215
gio/GioStream.cs Normal file
View file

@ -0,0 +1,215 @@
/*
* GioStream.cs: provide a System.IO.Stream api to [Input|Output]Streams
*
* Author(s):
* Stephane Delcroix (stephane@delcroix.org)
*
* Copyright (c) 2008 Novell, Inc.
*
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
using System;
namespace GLib
{
public class GioStream : System.IO.Stream
{
object stream;
bool can_read;
bool can_seek;
bool can_write;
bool is_disposed;
public GioStream (Uri uri, System.IO.FileMode mode)
{
throw new NotImplementedException ();
}
public GioStream (string filename, System.IO.FileMode mode)
{
throw new NotImplementedException ();
}
public GioStream (InputStream stream)
{
this.stream = stream;
can_read = true;
can_seek = stream is Seekable && (stream as Seekable).CanSeek;
}
public GioStream (OutputStream stream)
{
this.stream = stream;
can_write = true;
can_seek = stream is Seekable && (stream as Seekable).CanSeek;
}
public override bool CanSeek {
get { return can_seek; }
}
public override bool CanRead {
get { return can_read; }
}
public override bool CanWrite {
get { return can_write; }
}
public override long Length {
get {
if (!CanSeek)
throw new NotSupportedException ("This stream doesn't support seeking");
if (is_disposed)
throw new ObjectDisposedException ("The stream is closed");
if (stream is FileInputStream) {
FileInfo info = (stream as FileInputStream).QueryInfo ("standard::size", null);
return info.Size;
}
if (stream is FileOutputStream) {
FileInfo info = (stream as FileOutputStream).QueryInfo ("standard::size", null);
return info.Size;
}
throw new NotImplementedException (String.Format ("not implemented for {0} streams", stream.GetType()));
}
}
public override long Position {
get {
if (!CanSeek)
throw new NotSupportedException ("This stream doesn't support seeking");
if (is_disposed)
throw new ObjectDisposedException ("The stream is closed");
return (stream as Seekable).Position;
}
set {
Seek (value, System.IO.SeekOrigin.Begin);
}
}
public override void Flush ()
{
if (is_disposed)
throw new ObjectDisposedException ("The stream is closed");
}
public override int Read (byte[] buffer, int offset, int count)
{
if (buffer == null)
throw new ArgumentNullException ("buffer");
if (offset + count - 1 > buffer.Length)
throw new ArgumentException ("(offset + count - 1) is greater than the length of buffer");
if (offset < 0)
throw new ArgumentOutOfRangeException ("offset");
if (count < 0)
throw new ArgumentOutOfRangeException ("count");
if (!CanRead)
throw new NotSupportedException ("The stream does not support reading");
if (is_disposed)
throw new ObjectDisposedException ("The stream is closed");
InputStream input_stream = stream as InputStream;
if (input_stream == null)
throw new System.Exception ("this shouldn't happen");
if (offset == 0)
return (int)input_stream.Read (buffer, (ulong)count, null);
else {
byte[] buf = new byte[count];
int ret = (int)input_stream.Read (buf, (ulong)count, null);
buf.CopyTo (buffer, offset);
return ret;
}
}
public override void Write (byte[] buffer, int offset, int count)
{
if (buffer == null)
throw new ArgumentNullException ("buffer");
if (offset + count > buffer.Length)
throw new ArgumentException ("(offset + count) is greater than the length of buffer");
if (offset < 0)
throw new ArgumentOutOfRangeException ("offset");
if (count < 0)
throw new ArgumentOutOfRangeException ("count");
if (!CanWrite)
throw new NotSupportedException ("The stream does not support writing");
if (is_disposed)
throw new ObjectDisposedException ("The stream is closed");
OutputStream output_stream = stream as OutputStream;
if (output_stream == null)
throw new System.Exception ("this shouldn't happen");
if (offset == 0) {
output_stream.Write (buffer, (ulong)count, null);
return;
} else {
byte[] buf = new byte[count];
Array.Copy (buffer, offset, buf, 0, count);
output_stream.Write (buf, (ulong)count, null);
return;
}
}
public override long Seek (long offset, System.IO.SeekOrigin origin)
{
if (!CanSeek)
throw new NotSupportedException ("This stream doesn't support seeking");
if (is_disposed)
throw new ObjectDisposedException ("The stream is closed");
Seekable seekable = stream as Seekable;
SeekType seek_type;
switch (origin) {
case System.IO.SeekOrigin.Current:
seek_type = SeekType.Cur;
break;
case System.IO.SeekOrigin.End:
seek_type = SeekType.End;
break;
case System.IO.SeekOrigin.Begin:
default:
seek_type = SeekType.Set;
break;
}
seekable.Seek (offset, seek_type, null);
return Position;
}
public override void SetLength (long value)
{
if (!CanSeek || !CanWrite)
throw new NotSupportedException ("This stream doesn't support seeking");
if (is_disposed)
throw new ObjectDisposedException ("The stream is closed");
throw new NotImplementedException ();
}
public override void Close ()
{
if (stream is InputStream)
(stream as InputStream).Close (null);
if (stream is OutputStream)
(stream as OutputStream).Close (null);
is_disposed = true;
}
}
}

25
gio/Makefile.am Normal file
View file

@ -0,0 +1,25 @@
SUBDIRS = . glue
pkg = gio
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gio-sharp-2.0.pc
METADATA = Gio.metadata
SYMBOLS =
references = ../glib/glib-sharp.dll
glue_includes = gio/gio.h
POLICY_VERSIONS=
sources = \
FileFactory.cs \
GioStream.cs
customs = \
File.custom \
FileAdapter.custom \
FileEnumerator.custom
add_dist = gio-sharp-2.0.pc.in
include ../Makefile.include

5078
gio/gio-api.raw Normal file

File diff suppressed because it is too large Load diff

13
gio/gio-sharp-2.0.pc.in Normal file
View file

@ -0,0 +1,13 @@
prefix=${pcfiledir}/../..
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
assemblies_dir=${libdir}/mono/@PACKAGE_VERSION@
gapidir=${prefix}/share/gapi-2.0
Name: GIO#
Description: GIO# - GIO .NET Binding
Version: @VERSION@
Cflags: -I:${gapidir}/gio-api.xml
Libs: -r:${assemblies_dir}/gio-sharp.dll
Requires: glib-sharp-2.0

View file

@ -0,0 +1,6 @@
<configuration>
<dllmap dll="libgio-2.0-0.dll" target="libgio-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
<dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
<dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
<dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</configuration>

18
gio/glue/Makefile.am Normal file
View file

@ -0,0 +1,18 @@
lib_LTLIBRARIES = libgiosharpglue-2.la
libgiosharpglue_2_la_SOURCES =
nodist_libgiosharpglue_2_la_SOURCES = generated.c
libgiosharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
libgiosharpglue_2_la_LIBADD = $(GIO_LIBS)
INCLUDES = $(GIO_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)
libgiosharpglue.dll: $(libgiosharpglue_2_la_OBJECTS) libgiosharpglue.rc libgiosharpglue.def
./build-dll libgiosharpglue-2 $(VERSION)
CLEANFILES = lib*.a lib*.dll
EXTRA_DIST = win32dll.c

16
gio/glue/win32dll.c Executable file
View file

@ -0,0 +1,16 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
#include <stdio.h>
BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
{
return TRUE;
}
/*
BOOL APIENTRY DllMainCRTStartup (HINSTANCE hInst, DWORD reason, LPVOID reserved)
{
return TRUE;
}
*/

View file

@ -35,27 +35,3 @@ public class ColorSelectionButton : Gtk.Button {
}
}
[DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_color_selection_dialog_get_colorsel (IntPtr i);
public ColorSelection ColorSelection {
get { return GLib.Object.GetObject (gtksharp_color_selection_dialog_get_colorsel (this.Handle), false) as ColorSelection; }
}
[DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_color_selection_dialog_get_ok_button (IntPtr i);
public Button OkButton {
get { return GLib.Object.GetObject (gtksharp_color_selection_dialog_get_ok_button (this.Handle), false) as Button; }
}
[DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_color_selection_dialog_get_cancel_button (IntPtr i);
public Button CancelButton {
get { return GLib.Object.GetObject (gtksharp_color_selection_dialog_get_cancel_button (this.Handle), false) as Button; }
}
[DllImport("gtksharpglue-2")]
static extern IntPtr gtksharp_color_selection_dialog_get_help_button (IntPtr i);
public Button HelpButton {
get { return GLib.Object.GetObject (gtksharp_color_selection_dialog_get_help_button (this.Handle), false) as Button; }
}

View file

@ -31,6 +31,7 @@
<attr path="/api/namespace/boxed[@cname='GtkSelectionData']/field[@name='Target']" name="access">public</attr>
<attr path="/api/namespace/boxed[@cname='GtkSelectionData']/field[@name='Type']" name="access">public</attr>
<attr path="/api/namespace/boxed[@cname='GtkSelectionData']/method[@name='Free']" name="deprecated">1</attr>
<attr path="/api/namespace/boxed[@cname='GtkSelectionData']/method[@name='GetData']" name="hidden">1</attr>
<attr path="/api/namespace/boxed[@cname='GtkSelectionData']/method[@name='GetTargets']" name="hidden">1</attr>
<attr path="/api/namespace/boxed[@cname='GtkSelectionData']/method[@name='GetText']" name="hidden">1</attr>
<attr path="/api/namespace/boxed[@cname='GtkSelectionData']/method[@name='SetText']" name="hidden">1</attr>
@ -299,6 +300,11 @@
<attr path="/api/namespace/object[@cname='GtkColorSelection']/method[@name='SetChangePaletteWithScreenHook']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkColorSelection']/method[@name='SetColor']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkColorSelection']/method[@name='SetPreviousColor']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkColorSelectionDialog']/method[@name='GetColorSelection']/return-type" name="type">GtkColorSelection*</attr>
<attr path="/api/namespace/object[@cname='GtkColorSelectionDialog']/property[@name='OkButton']" name="type">GtkButton*</attr>
<attr path="/api/namespace/object[@cname='GtkColorSelectionDialog']/property[@name='CancelButton']" name="type">GtkButton*</attr>
<attr path="/api/namespace/object[@cname='GtkColorSelectionDialog']/property[@name='ColorSelection']" name="type">GtkColorSelection*</attr>
<attr path="/api/namespace/object[@cname='GtkColorSelectionDialog']/property[@name='HelpButton']" name="type">GtkButton*</attr>
<attr path="/api/namespace/object[@cname='GtkCombo']/field[@name='Button']" name="type">GtkButton*</attr>
<attr path="/api/namespace/object[@cname='GtkCombo']/field[@name='Button']" name="access">public</attr>
<attr path="/api/namespace/object[@cname='GtkCombo']/field[@name='Entry']" name="type">GtkEntry*</attr>
@ -306,6 +312,8 @@
<attr path="/api/namespace/object[@cname='GtkComboBox']/method[@name='GetActiveIter']/*/*[@type='GtkTreeIter*']" name="pass_as">out</attr>
<attr path="/api/namespace/object[@cname='GtkComboBox']/method[@name='GetTitle']" name="name">GetTearoffTitle</attr>
<attr path="/api/namespace/object[@cname='GtkComboBox']/method[@name='SetTitle']" name="name">SetTearoffTitle</attr>
<attr path="/api/namespace/object[@cname='GtkComboBox']/signal[@name='Popdown']" name="name">PoppedDown</attr>
<attr path="/api/namespace/object[@cname='GtkComboBox']/signal[@name='Popup']" name="name">PoppedUp</attr>
<add-node path="/api/namespace/object[@cname='GtkContainer']"><implements><interface name="IEnumerable" /></implements></add-node>
<attr path="/api/namespace/object[@cname='GtkContainer']/field[@name='FocusChild']" name="access">public</attr>
<attr path="/api/namespace/object[@cname='GtkContainer']/method[@name='AddWithProperties']" name="hidden">1</attr>
@ -332,6 +340,7 @@
<attr path="/api/namespace/object[@cname='GtkDialog']/field[@name='Vbox']" name="name">VBox</attr>
<attr path="/api/namespace/object[@cname='GtkDialog']/field[@name='VBox']" name="type">GtkVBox*</attr>
<attr path="/api/namespace/object[@cname='GtkDialog']/method[@name='AddButtons']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkDialog']/method[@name='GetActionArea']/return-type" name="type">GtkHButtonBox*</attr>
<attr path="/api/namespace/object[@cname='GtkDialog']/method[@name='Response']" name="name">Respond</attr>
<attr path="/api/namespace/object[@cname='GtkDialog']/method[@name='SetDefaultResponse']/*/*[@name='response_id']" name="type">GtkResponseType</attr>
<attr path="/api/namespace/object[@cname='GtkDialog']/method[@name='SetResponseSensitive']/*/*[@name='response_id']" name="type">GtkResponseType</attr>
@ -384,9 +393,14 @@
<attr path="/api/namespace/object[@cname='GtkFontSelectionDialog']/field[@name='CancelButton']" name="access">public</attr>
<attr path="/api/namespace/object[@cname='GtkFontSelectionDialog']/field[@name='OkButton']" name="type">GtkButton*</attr>
<attr path="/api/namespace/object[@cname='GtkFontSelectionDialog']/field[@name='OkButton']" name="access">public</attr>
<attr path="/api/namespace/object[@cname='GtkFontSelectionDialog']/method[@name='GetApplyButton']/return-type" name="type">GtkButton*</attr>
<attr path="/api/namespace/object[@cname='GtkFontSelectionDialog']/method[@name='GetCancelButton']/return-type" name="type">GtkButton*</attr>
<attr path="/api/namespace/object[@cname='GtkFontSelectionDialog']/method[@name='GetOkButton']/return-type" name="type">GtkButton*</attr>
<attr path="/api/namespace/object[@cname='GtkFrame']/method[@name='GetLabelAlign']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkFrame']/method[@name='SetLabelAlign']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkHandleBox']/property[@name='ChildDetached']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkHandleBox']/property[@name='ShadowType']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkHandleBox']/method[@name='GetChildDetached']" name="name">IsChildDetached</attr>
<attr path="/api/namespace/object[@cname='GtkHScale']/constructor[@cname='gtk_hscale_new_with_range']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkHSV']/signal" name="field_name"></attr>
<attr path="/api/namespace/object[@cname='GtkIconTheme']/method[@name='ChooseIcon']/*/*[@name='icon_names']" name="null_term_array">1</attr>
@ -489,6 +503,7 @@
<attr path="/api/namespace/object[@cname='GtkMenuShell']/signal[@name='Deactivate']" name="name">Deactivated</attr>
<attr path="/api/namespace/object[@cname='GtkMessageDialog']/constructor[@cname='gtk_message_dialog_new']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkMessageDialog']/constructor[@cname='gtk_message_dialog_new_with_markup']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkMountOperation']/method[@name='IsShowing']" name="name">GetIsShowing</attr>
<attr path="/api/namespace/object[@cname='GtkNotebook']/property[@name='Homogeneous']" name="deprecated">1</attr>
<attr path="/api/namespace/object[@cname='GtkNotebook']/signal[@name='ChangeCurrentPage']/return-type" name="type">void</attr>
<attr path="/api/namespace/object[@cname='GtkNotebook']/signal[@name='ReorderTab']/return-type" name="type">void</attr>
@ -506,6 +521,7 @@
<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>
<attr path="/api/namespace/object[@cname='GtkPlug']/method[@name='GetEmbedded']" name="name">GetIsEmbedded</attr>
<attr path="/api/namespace/object[@cname='GtkPrintContext']/method[@name='GetCairoContext']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkPrinter']/method[@name='AcceptsPdf']" name="name">GetAcceptsPdf</attr>
<attr path="/api/namespace/object[@cname='GtkPrinter']/method[@name='AcceptsPs']" name="name">GetAcceptsPs</attr>
@ -553,6 +569,7 @@
<attr path="/api/namespace/object[@cname='GtkScaleButton']" name="disable_gtype_ctor">1</attr>
<attr path="/api/namespace/object[@cname='GtkScaleButton']/constructor[@cname='gtk_scale_button_new']/*/*[@name='icons']" name="null_term_array">1</attr>
<attr path="/api/namespace/object[@cname='GtkScaleButton']/method[@name='SetIcons']/*/*[@name='icons']" name="null_term_array">1</attr>
<attr path="/api/namespace/object[@cname='GtkScaleButton']/signal[@name='Popup']" name="name">PoppedUp</attr>
<attr path="/api/namespace/object[@cname='GtkScrolledWindow']/field[@name='Hscrollbar']" name="access">private</attr>
<attr path="/api/namespace/object[@cname='GtkScrolledWindow']/field[@name='Vscrollbar']" name="access">private</attr>
<attr path="/api/namespace/object[@cname='GtkScrolledWindow']/method[@name='GetHscrollbar']" name="name">GetHScrollbar</attr>
@ -669,6 +686,7 @@
<attr path="/api/namespace/object[@cname='GtkToolbar']/method[@name='InsertStock']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkToolbar']/method[@name='PrependElement']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkToolbar']/method[@name='PrependItem']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkToolItem']/method[@name='ToolbarReconfigured']" name="name">EmitToolbarReconfigured</attr>
<attr path="/api/namespace/object[@cname='GtkToolItem']/signal[@name='SetTooltip']" name="name">TooltipSet</attr>
<attr path="/api/namespace/object[@cname='GtkTooltip']" name="disable_gtype_ctor">1</attr>
<attr path="/api/namespace/object[@cname='GtkTreeModelFilter']/constructor[@cname='gtk_tree_model_filter_new']/*/*[@name='root']" name="property_name">virtual-root</attr>
@ -761,6 +779,7 @@
<attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='Destroy']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='Destroyed']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='Event']" name="name">ProcessEvent</attr>
<attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='GetAllocation']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='GetChildRequisition']/*/*[@name='requisition']" name="pass_as">out</attr>
<attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='GetColormap']" name="needs_ref">1</attr>
<attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='GetDefaultColormap']" name="needs_ref">1</attr>
@ -796,8 +815,10 @@
<attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='Focus']" name="name">Focused</attr>
<attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='GrabFocus']" name="name">FocusGrabbed</attr>
<attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='Hide']" name="name">Hidden</attr>
<attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='KeynavFailed']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='Map']" name="name">Mapped</attr>
<attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='MnemonicActivate']" name="name">MnemonicActivated</attr>
<attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='MoveFocus']/*/*[@name='p0']" name="name">direction</attr>
<attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='Realize']" name="name">Realized</attr>
<attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='ShowHelp']" name="name">HelpShown</attr>
<attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='Show']" name="name">Shown</attr>

View file

@ -11,9 +11,9 @@ pkgconfigdir=$(libdir)/pkgconfig
pkgconfig_DATA=gtk-sharp-2.0.pc
SYMBOLS = gtk-symbols.xml
INCLUDE_API = $(srcdir)/../glib/glib-api.xml ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml
INCLUDE_API = $(srcdir)/../glib/glib-api.xml $(top_builddir)/gio/gio-api.xml $(top_builddir)/pango/pango-api.xml $(top_builddir)/atk/atk-api.xml $(top_builddir)/gdk/gdk-api.xml
METADATA = Gtk.metadata
references = ../glib/glib-sharp.dll ../pango/pango-sharp.dll ../atk/atk-sharp.dll ../gdk/gdk-sharp.dll $(local_mono_cairo)
references = $(top_builddir)/glib/glib-sharp.dll $(top_builddir)/gio/gio-sharp.dll $(top_builddir)/pango/pango-sharp.dll $(top_builddir)/atk/atk-sharp.dll $(top_builddir)/gdk/gdk-sharp.dll $(local_mono_cairo)
glue_includes = gtk/gtk.h
sources = \
@ -23,7 +23,6 @@ sources = \
ChildPropertyAttribute.cs \
ITreeNode.cs \
Key.cs \
MoveFocusHandler.cs \
NodeCellDataFunc.cs \
NodeSelection.cs \
NodeStore.cs \

View file

@ -42,3 +42,11 @@
}
}
[DllImport("libgtk-win32-2.0-0.dll")]
static extern void gtk_menu_set_active (IntPtr raw, uint index_);
public void SetActive (uint index_)
{
gtk_menu_set_active (Handle, index_);
}

View file

@ -1,20 +0,0 @@
// This file was generated by the Gtk# code generator.
// Any changes made will be lost if regenerated.
namespace Gtk {
using System;
[Obsolete ("Events using this type were replaced by Gtk.Widget keybinding signal")]
public delegate void MoveFocusHandler(object o, MoveFocusArgs args);
[Obsolete ("Events using this type were replaced by Gtk.Widget keybinding signal")]
public class MoveFocusArgs : GLib.SignalArgs {
public Gtk.DirectionType Direction{
get {
return (Gtk.DirectionType) Args[0];
}
}
}
}

View file

@ -43,6 +43,16 @@
return ret;
}
public TreeIter ConvertChildIterToIter (TreeIter iter)
{
TreeIter result;
if (ConvertChildIterToIter (out result, iter))
return result;
else
return TreeIter.Zero;
}
public void SetValue (Gtk.TreeIter iter, int column, bool value) {
throw new NotImplementedException ();
}

View file

@ -4,7 +4,6 @@ libgtksharpglue_2_la_SOURCES = \
adjustment.c \
cellrenderer.c \
clipboard.c \
colorseldialog.c \
container.c \
nodestore.c \
object.c \

View file

@ -1,56 +0,0 @@
/* colorseldialog.c : Glue for accessing fields in the GtkColorSelectionDialog widget.
*
* Author: Duncan Mak (duncan@ximian.com)
*
* Copyright (c) Ximian, INc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the Lesser GNU General
* Public License as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include <gtk/gtkcolorseldialog.h>
/* Forward declarations */
GtkWidget *gtksharp_color_selection_dialog_get_colorsel (GtkColorSelectionDialog *dialog);
GtkWidget *gtksharp_color_selection_dialog_get_ok_button (GtkColorSelectionDialog *dialog);
GtkWidget *gtksharp_color_selection_dialog_get_cancel_button (GtkColorSelectionDialog *dialog);
GtkWidget *gtksharp_color_selection_dialog_get_help_button (GtkColorSelectionDialog *dialog);
/* */
GtkWidget*
gtksharp_color_selection_dialog_get_colorsel (GtkColorSelectionDialog *dialog)
{
return dialog->colorsel;
}
GtkWidget*
gtksharp_color_selection_dialog_get_ok_button (GtkColorSelectionDialog *dialog)
{
return dialog->ok_button;
}
GtkWidget*
gtksharp_color_selection_dialog_get_cancel_button (GtkColorSelectionDialog *dialog)
{
return dialog->cancel_button;
}
GtkWidget*
gtksharp_color_selection_dialog_get_help_button (GtkColorSelectionDialog *dialog)
{
return dialog->help_button;
}

File diff suppressed because it is too large Load diff

View file

@ -13,6 +13,8 @@
<attr path="/api/namespace/boxed[@cname='PangoFontDescription']/method[@name='Hash']" name="name">GetHash</attr>
<attr path="/api/namespace/boxed[@cname='PangoFontMetrics']/method[@name='Ref']" name="deprecated">1</attr>
<attr path="/api/namespace/boxed[@cname='PangoFontMetrics']/method[@name='Unref']" name="deprecated">1</attr>
<attr path="/api/namespace/boxed[@cname='PangoGlyphItem']/method[@name='ApplyAttrs']" name="hidden">1</attr>
<attr path="/api/namespace/boxed[@cname='PangoGlyphItem']/method[@name='Free']" name="deprecated">1</attr>
<attr path="/api/namespace/boxed[@cname='PangoGlyphString']/field[@name='Glyphs']" name="hidden">1</attr>
<attr path="/api/namespace/boxed[@cname='PangoGlyphString']/field[@name='LogClusters']" name="hidden">1</attr>
<attr path="/api/namespace/boxed[@cname='PangoLayoutIter']/method[@name='Free']" name="deprecated">1</attr>
@ -83,7 +85,6 @@
<attr path="/api/namespace/struct[@cname='PangoCoverage']/method[@name='Ref']" name="deprecated">1</attr>
<attr path="/api/namespace/struct[@cname='PangoCoverage']/method[@name='ToBytes']" name="hidden">1</attr>
<attr path="/api/namespace/struct[@cname='PangoCoverage']/method[@name='Unref']" name="deprecated">1</attr>
<attr path="/api/namespace/struct[@cname='PangoGlyphItem']/method[@name='ApplyAttrs']" name="hidden">1</attr>
<attr path="/api/namespace/*[@cname='PangoLayoutLine']/field" name="writeable">false</attr>
<attr path="/api/namespace/*[@cname='PangoLayoutLine']/field[@name='Runs']" name="access">private</attr>
<attr path="/api/namespace/*[@cname='PangoLayoutLine']/method[@name='GetExtents']/*/*[@type='PangoRectangle*']" name="pass_as">ref</attr>

View file

@ -37,6 +37,27 @@
<member cname="PANGO_ATTR_GRAVITY" name="Gravity" />
<member cname="PANGO_ATTR_GRAVITY_HINT" name="GravityHint" />
</enum>
<enum name="BidiType" cname="PangoBidiType" gtype="pango_bidi_type_get_type" type="enum">
<member cname="PANGO_BIDI_TYPE_L" name="L" />
<member cname="PANGO_BIDI_TYPE_LRE" name="Lre" />
<member cname="PANGO_BIDI_TYPE_LRO" name="Lro" />
<member cname="PANGO_BIDI_TYPE_R" name="R" />
<member cname="PANGO_BIDI_TYPE_AL" name="Al" />
<member cname="PANGO_BIDI_TYPE_RLE" name="Rle" />
<member cname="PANGO_BIDI_TYPE_RLO" name="Rlo" />
<member cname="PANGO_BIDI_TYPE_PDF" name="Pdf" />
<member cname="PANGO_BIDI_TYPE_EN" name="En" />
<member cname="PANGO_BIDI_TYPE_ES" name="Es" />
<member cname="PANGO_BIDI_TYPE_ET" name="Et" />
<member cname="PANGO_BIDI_TYPE_AN" name="An" />
<member cname="PANGO_BIDI_TYPE_CS" name="Cs" />
<member cname="PANGO_BIDI_TYPE_NSM" name="Nsm" />
<member cname="PANGO_BIDI_TYPE_BN" name="Bn" />
<member cname="PANGO_BIDI_TYPE_B" name="B" />
<member cname="PANGO_BIDI_TYPE_S" name="S" />
<member cname="PANGO_BIDI_TYPE_WS" name="Ws" />
<member cname="PANGO_BIDI_TYPE_ON" name="On" />
</enum>
<enum name="CoverageLevel" cname="PangoCoverageLevel" gtype="pango_coverage_level_get_type" type="enum">
<member cname="PANGO_COVERAGE_NONE" name="None" />
<member cname="PANGO_COVERAGE_FALLBACK" name="Fallback" />
@ -154,6 +175,17 @@
<member cname="PANGO_SCRIPT_PHOENICIAN" name="Phoenician" />
<member cname="PANGO_SCRIPT_PHAGS_PA" name="PhagsPa" />
<member cname="PANGO_SCRIPT_NKO" name="Nko" />
<member cname="PANGO_SCRIPT_KAYAH_LI" name="KayahLi" />
<member cname="PANGO_SCRIPT_LEPCHA" name="Lepcha" />
<member cname="PANGO_SCRIPT_REJANG" name="Rejang" />
<member cname="PANGO_SCRIPT_SUNDANESE" name="Sundanese" />
<member cname="PANGO_SCRIPT_SAURASHTRA" name="Saurashtra" />
<member cname="PANGO_SCRIPT_CHAM" name="Cham" />
<member cname="PANGO_SCRIPT_OL_CHIKI" name="OlChiki" />
<member cname="PANGO_SCRIPT_VAI" name="Vai" />
<member cname="PANGO_SCRIPT_CARIAN" name="Carian" />
<member cname="PANGO_SCRIPT_LYCIAN" name="Lycian" />
<member cname="PANGO_SCRIPT_LYDIAN" name="Lydian" />
</enum>
<enum name="Stretch" cname="PangoStretch" gtype="pango_stretch_get_type" type="enum">
<member cname="PANGO_STRETCH_ULTRA_CONDENSED" name="UltraCondensed" />
@ -245,7 +277,7 @@
</method>
</object>
<object name="CairoFontMap" cname="PangoCairoFontMap">
<method name="CreateContext" cname="pango_cairo_font_map_create_context">
<method name="CreateContext" cname="pango_cairo_font_map_create_context" deprecated="1">
<return-type type="PangoContext*" />
</method>
<method name="GetDefault" cname="pango_cairo_font_map_get_default" shared="true">
@ -266,6 +298,9 @@
<parameter type="cairo_font_type_t" name="fonttype" />
</parameters>
</constructor>
<method name="SetDefault" cname="pango_cairo_font_map_set_default">
<return-type type="void" />
</method>
<method name="SetResolution" cname="pango_cairo_font_map_set_resolution">
<return-type type="void" />
<parameters>
@ -328,6 +363,7 @@
<parameter type="PangoLanguage*" name="language" />
</parameters>
</method>
<constructor cname="pango_context_new" />
<method name="SetBaseDir" cname="pango_context_set_base_dir">
<return-type type="void" />
<parameters>
@ -346,6 +382,12 @@
<parameter type="const-PangoFontDescription*" name="desc" />
</parameters>
</method>
<method name="SetFontMap" cname="pango_context_set_font_map">
<return-type type="void" />
<parameters>
<parameter type="PangoFontMap*" name="font_map" />
</parameters>
</method>
<method name="SetGravityHint" cname="pango_context_set_gravity_hint">
<return-type type="void" />
<parameters>
@ -474,6 +516,9 @@
</method>
</object>
<object name="FontMap" cname="PangoFontMap" parent="GObject">
<method name="CreateContext" cname="pango_font_map_create_context">
<return-type type="PangoContext*" />
</method>
<method name="GetType" cname="pango_font_map_get_type" shared="true">
<return-type type="GType" />
</method>
@ -501,7 +546,7 @@
</method>
</object>
<object name="FT2FontMap" cname="PangoFT2FontMap" parent="PangoFcFontMap">
<method name="CreateContext" cname="pango_ft2_font_map_create_context">
<method name="CreateContext" cname="pango_ft2_font_map_create_context" deprecated="1">
<return-type type="PangoContext*" />
</method>
<method name="ForDisplay" cname="pango_ft2_font_map_for_display" deprecated="1" shared="true">
@ -546,6 +591,9 @@
<method name="GetAutoDir" cname="pango_layout_get_auto_dir">
<return-type type="gboolean" />
</method>
<method name="GetBaseline" cname="pango_layout_get_baseline">
<return-type type="int" />
</method>
<method name="GetContext" cname="pango_layout_get_context">
<return-type type="PangoContext*" />
</method>
@ -570,6 +618,9 @@
<method name="GetFontDescription" cname="pango_layout_get_font_description">
<return-type type="const-PangoFontDescription*" />
</method>
<method name="GetHeight" cname="pango_layout_get_height">
<return-type type="int" />
</method>
<method name="GetIndent" cname="pango_layout_get_indent">
<return-type type="int" />
</method>
@ -720,6 +771,12 @@
<parameter type="const-PangoFontDescription*" name="desc" />
</parameters>
</method>
<method name="SetHeight" cname="pango_layout_set_height">
<return-type type="void" />
<parameters>
<parameter type="int" name="height" />
</parameters>
</method>
<method name="SetIndent" cname="pango_layout_set_indent">
<return-type type="void" />
<parameters>
@ -890,6 +947,16 @@
<parameter type="PangoLayoutRun*" name="run" />
</parameters>
</virtual_method>
<virtual_method name="DrawGlyphItem" cname="draw_glyph_item">
<return-type type="void" />
<parameters>
<parameter type="PangoRenderer*" name="renderer" />
<parameter type="const-char*" name="text" />
<parameter type="PangoGlyphItem*" name="glyph_item" />
<parameter type="int" name="x" />
<parameter type="int" name="y" />
</parameters>
</virtual_method>
<method name="Activate" cname="pango_renderer_activate">
<return-type type="void" />
</method>
@ -914,6 +981,15 @@
<parameter type="double" name="y" />
</parameters>
</method>
<method name="DrawGlyphItem" cname="pango_renderer_draw_glyph_item">
<return-type type="void" />
<parameters>
<parameter type="const-char*" name="text" />
<parameter type="PangoGlyphItem*" name="glyph_item" />
<parameter type="int" name="x" />
<parameter type="int" name="y" />
</parameters>
</method>
<method name="DrawGlyphs" cname="pango_renderer_draw_glyphs">
<return-type type="void" />
<parameters>
@ -967,6 +1043,12 @@
<parameter type="PangoRenderPart" name="part" />
</parameters>
</method>
<method name="GetLayout" cname="pango_renderer_get_layout">
<return-type type="PangoLayout*" />
</method>
<method name="GetLayoutLine" cname="pango_renderer_get_layout_line">
<return-type type="PangoLayoutLine*" />
</method>
<method name="GetMatrix" cname="pango_renderer_get_matrix">
<return-type type="const-PangoMatrix*" />
</method>
@ -1199,6 +1281,12 @@
<parameter type="const-PangoAttribute*" name="attr2" />
</parameters>
</method>
<method name="Init" cname="pango_attribute_init">
<return-type type="void" />
<parameters>
<parameter type="const-PangoAttrClass*" name="klass" />
</parameters>
</method>
</struct>
<boxed name="Color" cname="PangoColor">
<field name="Red" cname="red" type="guint16" />
@ -1460,7 +1548,7 @@
<field name="Geometry" cname="geometry" type="PangoGlyphGeometry" />
<field name="Attr" cname="attr" type="PangoGlyphVisAttr" />
</struct>
<struct name="GlyphItem" cname="PangoGlyphItem">
<boxed name="GlyphItem" cname="PangoGlyphItem">
<field name="Item" cname="item" type="PangoItem*" />
<field name="Glyphs" cname="glyphs" type="PangoGlyphString*" />
<method name="ApplyAttrs" cname="pango_glyph_item_apply_attrs">
@ -1470,9 +1558,15 @@
<parameter type="PangoAttrList*" name="list" />
</parameters>
</method>
<method name="Copy" cname="pango_glyph_item_copy">
<return-type type="PangoGlyphItem*" owned="true" />
</method>
<method name="Free" cname="pango_glyph_item_free">
<return-type type="void" />
</method>
<method name="GetType" cname="pango_glyph_item_get_type" shared="true">
<return-type type="GType" />
</method>
<method name="LetterSpace" cname="pango_glyph_item_letter_space">
<return-type type="void" />
<parameters>
@ -1488,7 +1582,46 @@
<parameter type="int" name="split_index" />
</parameters>
</method>
</struct>
</boxed>
<boxed name="GlyphItemIter" cname="PangoGlyphItemIter">
<field name="GlyphItem" cname="glyph_item" type="PangoGlyphItem*" />
<field name="Text" cname="text" type="const-gchar*" />
<field name="StartGlyph" cname="start_glyph" type="int" />
<field name="StartIndex" cname="start_index" type="int" />
<field name="StartChar" cname="start_char" type="int" />
<field name="EndGlyph" cname="end_glyph" type="int" />
<field name="EndIndex" cname="end_index" type="int" />
<field name="EndChar" cname="end_char" type="int" />
<method name="Copy" cname="pango_glyph_item_iter_copy">
<return-type type="PangoGlyphItemIter*" owned="true" />
</method>
<method name="Free" cname="pango_glyph_item_iter_free">
<return-type type="void" />
</method>
<method name="GetType" cname="pango_glyph_item_iter_get_type" shared="true">
<return-type type="GType" />
</method>
<method name="InitEnd" cname="pango_glyph_item_iter_init_end">
<return-type type="gboolean" />
<parameters>
<parameter type="PangoGlyphItem*" name="glyph_item" />
<parameter type="const-char*" name="text" />
</parameters>
</method>
<method name="InitStart" cname="pango_glyph_item_iter_init_start">
<return-type type="gboolean" />
<parameters>
<parameter type="PangoGlyphItem*" name="glyph_item" />
<parameter type="const-char*" name="text" />
</parameters>
</method>
<method name="NextCluster" cname="pango_glyph_item_iter_next_cluster">
<return-type type="gboolean" />
</method>
<method name="PrevCluster" cname="pango_glyph_item_iter_prev_cluster">
<return-type type="gboolean" />
</method>
</boxed>
<boxed name="GlyphString" cname="PangoGlyphString" opaque="true">
<field name="NumGlyphs" cname="num_glyphs" type="gint" access="public" writeable="true" />
<field name="Glyphs" cname="glyphs" type="PangoGlyphInfo*" access="public" writeable="true" />
@ -1603,6 +1736,12 @@
<method name="GetSampleString" cname="pango_language_get_sample_string">
<return-type type="const-char*" />
</method>
<method name="GetScripts" cname="pango_language_get_scripts">
<return-type type="const-PangoScript*" />
<parameters>
<parameter type="int*" name="num_scripts" />
</parameters>
</method>
<method name="GetType" cname="pango_language_get_type" shared="true">
<return-type type="GType" />
</method>
@ -1618,11 +1757,17 @@
<parameter type="const-char*" name="range_list" />
</parameters>
</method>
<method name="ToString" cname="pango_language_to_string">
<return-type type="const-char*" />
</method>
</boxed>
<boxed name="LayoutIter" cname="PangoLayoutIter" opaque="true">
<method name="AtLastLine" cname="pango_layout_iter_at_last_line">
<return-type type="gboolean" />
</method>
<method name="Copy" cname="pango_layout_iter_copy">
<return-type type="PangoLayoutIter*" owned="true" />
</method>
<method name="Free" cname="pango_layout_iter_free">
<return-type type="void" />
</method>
@ -1645,6 +1790,9 @@
<method name="GetIndex" cname="pango_layout_iter_get_index">
<return-type type="int" />
</method>
<method name="GetLayout" cname="pango_layout_iter_get_layout">
<return-type type="PangoLayout*" />
</method>
<method name="GetLayoutExtents" cname="pango_layout_iter_get_layout_extents">
<return-type type="void" />
<parameters>
@ -1774,6 +1922,7 @@
<field name="IsSentenceEnd" cname="is_sentence_end" bits="1" type="guint" />
<field name="BackspaceDeletesCharacter" cname="backspace_deletes_character" bits="1" type="guint" />
<field name="IsExpandableSpace" cname="is_expandable_space" bits="1" type="guint" />
<field name="IsWordBoundary" cname="is_word_boundary" bits="1" type="guint" />
</struct>
<boxed name="Matrix" cname="PangoMatrix">
<field name="Xx" cname="xx" type="double" />
@ -2045,6 +2194,12 @@
<parameter type="PangoStyle" name="style" />
</parameters>
</method>
<method name="TypeGetName" cname="pango_attr_type_get_name" shared="true">
<return-type type="const-char*" />
<parameters>
<parameter type="PangoAttrType" name="type" />
</parameters>
</method>
<method name="TypeRegister" cname="pango_attr_type_register" shared="true">
<return-type type="PangoAttrType" />
<parameters>
@ -2078,140 +2233,18 @@
</parameters>
</method>
</class>
<class name="Cairo" cname="PangoCairo_">
<method name="ContextGetFontOptions" cname="pango_cairo_context_get_font_options" shared="true">
<return-type type="const-cairo_font_options_t*" />
<parameters>
<parameter type="PangoContext*" name="context" />
</parameters>
</method>
<method name="ContextGetResolution" cname="pango_cairo_context_get_resolution" shared="true">
<return-type type="double" />
<parameters>
<parameter type="PangoContext*" name="context" />
</parameters>
</method>
<method name="ContextGetShapeRenderer" cname="pango_cairo_context_get_shape_renderer" shared="true">
<return-type type="PangoCairoShapeRendererFunc" />
<parameters>
<parameter type="PangoContext*" name="context" />
<parameter type="gpointer*" name="data" />
</parameters>
</method>
<method name="ContextSetFontOptions" cname="pango_cairo_context_set_font_options" shared="true">
<return-type type="void" />
<parameters>
<parameter type="PangoContext*" name="context" />
<parameter type="const-cairo_font_options_t*" name="options" />
</parameters>
</method>
<method name="ContextSetResolution" cname="pango_cairo_context_set_resolution" shared="true">
<return-type type="void" />
<parameters>
<parameter type="PangoContext*" name="context" />
<parameter type="double" name="dpi" />
</parameters>
</method>
<method name="ContextSetShapeRenderer" cname="pango_cairo_context_set_shape_renderer" shared="true">
<return-type type="void" />
<parameters>
<parameter type="PangoContext*" name="context" />
<parameter type="PangoCairoShapeRendererFunc" name="func" />
<parameter type="gpointer" name="data" />
<parameter type="GDestroyNotify" name="dnotify" />
</parameters>
</method>
<method name="CreateLayout" cname="pango_cairo_create_layout" shared="true">
<return-type type="PangoLayout*" />
<parameters>
<parameter type="cairo_t*" name="cr" />
</parameters>
</method>
<method name="ErrorUnderlinePath" cname="pango_cairo_error_underline_path" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="double" name="x" />
<parameter type="double" name="y" />
<parameter type="double" name="width" />
<parameter type="double" name="height" />
</parameters>
</method>
<method name="GlyphStringPath" cname="pango_cairo_glyph_string_path" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="PangoFont*" name="font" />
<parameter type="PangoGlyphString*" name="glyphs" />
</parameters>
</method>
<method name="LayoutLinePath" cname="pango_cairo_layout_line_path" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="PangoLayoutLine*" name="line" />
</parameters>
</method>
<method name="LayoutPath" cname="pango_cairo_layout_path" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="PangoLayout*" name="layout" />
</parameters>
</method>
<method name="ShowErrorUnderline" cname="pango_cairo_show_error_underline" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="double" name="x" />
<parameter type="double" name="y" />
<parameter type="double" name="width" />
<parameter type="double" name="height" />
</parameters>
</method>
<method name="ShowGlyphString" cname="pango_cairo_show_glyph_string" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="PangoFont*" name="font" />
<parameter type="PangoGlyphString*" name="glyphs" />
</parameters>
</method>
<method name="ShowLayout" cname="pango_cairo_show_layout" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="PangoLayout*" name="layout" />
</parameters>
</method>
<method name="ShowLayoutLine" cname="pango_cairo_show_layout_line" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="PangoLayoutLine*" name="line" />
</parameters>
</method>
<method name="UpdateContext" cname="pango_cairo_update_context" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="PangoContext*" name="context" />
</parameters>
</method>
<method name="UpdateLayout" cname="pango_cairo_update_layout" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="PangoLayout*" name="layout" />
</parameters>
</method>
</class>
<class name="Global" cname="PangoGlobal">
<method name="BidiTypeForUnichar" cname="pango_bidi_type_for_unichar" shared="true">
<return-type type="PangoBidiType" />
<parameters>
<parameter type="gunichar" name="ch" />
</parameters>
</method>
<method name="ExtentsToPixels" cname="pango_extents_to_pixels" shared="true">
<return-type type="void" />
<parameters>
<parameter type="PangoRectangle*" name="ink_rect" />
<parameter type="PangoRectangle*" name="logical_rect" />
<parameter type="PangoRectangle*" name="inclusive" />
<parameter type="PangoRectangle*" name="nearest" />
</parameters>
</method>
<method name="FindBaseDir" cname="pango_find_base_dir" shared="true">
@ -2418,6 +2451,148 @@
</parameters>
</method>
</class>
<class name="Cairo" cname="PangoCairo_">
<method name="ContextGetFontOptions" cname="pango_cairo_context_get_font_options" shared="true">
<return-type type="const-cairo_font_options_t*" />
<parameters>
<parameter type="PangoContext*" name="context" />
</parameters>
</method>
<method name="ContextGetResolution" cname="pango_cairo_context_get_resolution" shared="true">
<return-type type="double" />
<parameters>
<parameter type="PangoContext*" name="context" />
</parameters>
</method>
<method name="ContextGetShapeRenderer" cname="pango_cairo_context_get_shape_renderer" shared="true">
<return-type type="PangoCairoShapeRendererFunc" />
<parameters>
<parameter type="PangoContext*" name="context" />
<parameter type="gpointer*" name="data" />
</parameters>
</method>
<method name="ContextSetFontOptions" cname="pango_cairo_context_set_font_options" shared="true">
<return-type type="void" />
<parameters>
<parameter type="PangoContext*" name="context" />
<parameter type="const-cairo_font_options_t*" name="options" />
</parameters>
</method>
<method name="ContextSetResolution" cname="pango_cairo_context_set_resolution" shared="true">
<return-type type="void" />
<parameters>
<parameter type="PangoContext*" name="context" />
<parameter type="double" name="dpi" />
</parameters>
</method>
<method name="ContextSetShapeRenderer" cname="pango_cairo_context_set_shape_renderer" shared="true">
<return-type type="void" />
<parameters>
<parameter type="PangoContext*" name="context" />
<parameter type="PangoCairoShapeRendererFunc" name="func" />
<parameter type="gpointer" name="data" />
<parameter type="GDestroyNotify" name="dnotify" />
</parameters>
</method>
<method name="CreateContext" cname="pango_cairo_create_context" shared="true">
<return-type type="PangoContext*" />
<parameters>
<parameter type="cairo_t*" name="cr" />
</parameters>
</method>
<method name="CreateLayout" cname="pango_cairo_create_layout" shared="true">
<return-type type="PangoLayout*" />
<parameters>
<parameter type="cairo_t*" name="cr" />
</parameters>
</method>
<method name="ErrorUnderlinePath" cname="pango_cairo_error_underline_path" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="double" name="x" />
<parameter type="double" name="y" />
<parameter type="double" name="width" />
<parameter type="double" name="height" />
</parameters>
</method>
<method name="GlyphStringPath" cname="pango_cairo_glyph_string_path" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="PangoFont*" name="font" />
<parameter type="PangoGlyphString*" name="glyphs" />
</parameters>
</method>
<method name="LayoutLinePath" cname="pango_cairo_layout_line_path" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="PangoLayoutLine*" name="line" />
</parameters>
</method>
<method name="LayoutPath" cname="pango_cairo_layout_path" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="PangoLayout*" name="layout" />
</parameters>
</method>
<method name="ShowErrorUnderline" cname="pango_cairo_show_error_underline" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="double" name="x" />
<parameter type="double" name="y" />
<parameter type="double" name="width" />
<parameter type="double" name="height" />
</parameters>
</method>
<method name="ShowGlyphItem" cname="pango_cairo_show_glyph_item" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="const-char*" name="text" />
<parameter type="PangoGlyphItem*" name="glyph_item" />
</parameters>
</method>
<method name="ShowGlyphString" cname="pango_cairo_show_glyph_string" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="PangoFont*" name="font" />
<parameter type="PangoGlyphString*" name="glyphs" />
</parameters>
</method>
<method name="ShowLayout" cname="pango_cairo_show_layout" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="PangoLayout*" name="layout" />
</parameters>
</method>
<method name="ShowLayoutLine" cname="pango_cairo_show_layout_line" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="PangoLayoutLine*" name="line" />
</parameters>
</method>
<method name="UpdateContext" cname="pango_cairo_update_context" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="PangoContext*" name="context" />
</parameters>
</method>
<method name="UpdateLayout" cname="pango_cairo_update_layout" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="PangoLayout*" name="layout" />
</parameters>
</method>
</class>
<class name="Units" cname="PangoUnits_">
<method name="FromDouble" cname="pango_units_from_double" shared="true">
<return-type type="int" />

View file

@ -296,7 +296,6 @@ foreach $cbname (sort(keys(%fpdefs))) {
}
}
##############################################################
# Parse the interfaces list.
##############################################################
@ -475,8 +474,7 @@ foreach $define (sort (keys (%defines))) {
##############################################################
if ($ARGV[1]) {
open(XMLFILE, ">$ARGV[1]") ||
die "Couldn't open $ARGV[1] for writing.\n";
open(XMLFILE, ">$ARGV[1]") || die "Couldn't open $ARGV[1] for writing.\n";
print XMLFILE $doc->toString();
close(XMLFILE);
} else {
@ -503,6 +501,7 @@ sub addFieldElems
$field = $2;
}
next if ($field !~ /\S/);
$field =~ s/GSEAL\s*\((.*)\)/\1/g;
$field =~ s/\s+(\*+)/\1 /g;
$field =~ s/(const\s+)?(\w+)\*\s+const\*/const \2\*/g;
$field =~ s/(\w+)\s+const\s*\*/const \1\*/g;

View file

@ -5,9 +5,9 @@ local_mono_cairo=
endif
assemblies = \
$(top_builddir)/glib/glib-sharp.dll $(top_builddir)/pango/pango-sharp.dll \
$(top_builddir)/atk/atk-sharp.dll $(top_builddir)/gdk/gdk-sharp.dll \
$(top_builddir)/gtk/gtk-sharp.dll $(local_mono_cairo)
$(top_builddir)/glib/glib-sharp.dll $(top_builddir)/gio/gio-sharp.dll \
$(top_builddir)/pango/pango-sharp.dll $(top_builddir)/atk/atk-sharp.dll \
$(top_builddir)/gdk/gdk-sharp.dll $(top_builddir)/gtk/gtk-sharp.dll $(local_mono_cairo)
references = $(addprefix /r:, $(assemblies)) @MONO_CAIRO_LIBS@
TARGETS = GtkDemo.exe

View file

@ -26,7 +26,15 @@ TARGETS = polarfixed.exe custom-widget.exe custom-cellrenderer.exe gtk-hello-wor
DEBUGS = $(addsuffix .mdb, $(TARGETS))
assemblies=../glib/glib-sharp.dll ../pango/pango-sharp.dll ../atk/atk-sharp.dll ../gdk/gdk-sharp.dll ../gtk/gtk-sharp.dll $(GLADE_ASSEMBLY)
assemblies = \
$(top_builddir)/glib/glib-sharp.dll \
$(top_builddir)/gio/gio-sharp.dll \
$(top_builddir)/pango/pango-sharp.dll \
$(top_builddir)/atk/atk-sharp.dll \
$(top_builddir)/gdk/gdk-sharp.dll \
$(top_builddir)/gtk/gtk-sharp.dll \
$(GLADE_ASSEMBLY)
references=$(addprefix /r:, $(assemblies))
noinst_SCRIPTS = $(TARGETS)

View file

@ -1,30 +1,28 @@
EXTRA_DIST = \
README \
gtk-sharp-2.12-sources.xml \
gtkclipboard.patch \
gtk_tree_model_signal_fix.patch \
gtk_tree_model_signal_fix-2.10.patch
sources.xml \
gtk_tree_model_signal_fix.patch
MAJ=2.24
PT=2.24.0
TARGET_GTK_VERSION=2.14.3
GTK_2_12_DOWNLOADS = \
http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.0/sources/pango-1.18.2.tar.bz2 \
http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.0/sources/atk-1.20.0.tar.bz2 \
http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.0/sources/gtk+-2.12.0.tar.bz2 \
http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.0/sources/libglade-2.6.2.tar.bz2
GTK_DOWNLOADS = \
http://ftp.gnome.org/pub/GNOME/platform/$(MAJ)/$(PT)/sources/glib-2.18.1.tar.bz2 \
http://ftp.gnome.org/pub/GNOME/platform/$(MAJ)/$(PT)/sources/pango-1.22.0.tar.bz2 \
http://ftp.gnome.org/pub/GNOME/platform/$(MAJ)/$(PT)/sources/atk-1.24.0.tar.bz2 \
http://ftp.gnome.org/pub/GNOME/platform/$(MAJ)/$(PT)/sources/gtk+-$(TARGET_GTK_VERSION).tar.bz2 \
http://ftp.gnome.org/pub/GNOME/platform/$(MAJ)/$(PT)/sources/libglade-2.6.3.tar.bz2
api: api-2.12
api:
PATH=../parser:$$PATH $(RUNTIME) ../parser/gapi-parser.exe sources.xml
api-2.12:
PATH=../parser:$$PATH $(RUNTIME) ../parser/gapi-parser.exe gtk-sharp-2.12-sources.xml
get-source-code: get-2.12-sources
get-2.12-sources:
for i in $(GTK_2_12_DOWNLOADS); do \
get-source-code:
for i in $(GTK_DOWNLOADS); do \
wget $$i --output-document=- | tar -xj ; \
done;
ln -f -s gtkfilechooserprivate.h gtk+-2.12.0/gtk/gtkfilechooserpriv.h
patch -p0 gtk+-2.12.0/gtk/gtktreemodel.c < gtk_tree_model_signal_fix-2.10.patch
echo "typedef struct _GtkClipboard GtkClipboard;" >> gtk+-2.12.0/gtk/gtkclipboard.h
echo "typedef struct _GtkClipboardClass GtkClipboardClass;" >> gtk+-2.12.0/gtk/gtkclipboard.h
ln -f -s gtkfilechooserprivate.h gtk+-$(TARGET_GTK_VERSION)/gtk/gtkfilechooserpriv.h
patch -p0 gtk+-$(TARGET_GTK_VERSION)/gtk/gtktreemodel.c < gtk_tree_model_signal_fix.patch
echo "typedef struct _GtkClipboard GtkClipboard;" >> gtk+-$(TARGET_GTK_VERSION)/gtk/gtkclipboard.h
echo "typedef struct _GtkClipboardClass GtkClipboardClass;" >> gtk+-$(TARGET_GTK_VERSION)/gtk/gtkclipboard.h

View file

@ -1,58 +0,0 @@
173,180c173,181
< g_signal_newv (I_("row_inserted"),
< GTK_TYPE_TREE_MODEL,
< G_SIGNAL_RUN_FIRST,
< closure,
< NULL, NULL,
< _gtk_marshal_VOID__BOXED_BOXED,
< G_TYPE_NONE, 2,
< row_inserted_params);
---
> g_signal_new ("row_inserted",
> GTK_TYPE_TREE_MODEL,
> G_SIGNAL_RUN_FIRST,
> G_STRUCT_OFFSET (GtkTreeModelIface, row_inserted),
> NULL, NULL,
> _gtk_marshal_VOID__BOXED_BOXED,
> G_TYPE_NONE, 2,
> GTK_TYPE_TREE_PATH,
> GTK_TYPE_TREE_ITER);
196,203c197,204
< g_signal_newv (I_("row_deleted"),
< GTK_TYPE_TREE_MODEL,
< G_SIGNAL_RUN_FIRST,
< closure,
< NULL, NULL,
< _gtk_marshal_VOID__BOXED,
< G_TYPE_NONE, 1,
< row_deleted_params);
---
> g_signal_new ("row_deleted",
> GTK_TYPE_TREE_MODEL,
> G_SIGNAL_RUN_FIRST,
> G_STRUCT_OFFSET (GtkTreeModelIface, row_deleted),
> NULL, NULL,
> _gtk_marshal_VOID__BOXED,
> G_TYPE_NONE, 1,
> GTK_TYPE_TREE_PATH);
208,215c209,219
< g_signal_newv (I_("rows_reordered"),
< GTK_TYPE_TREE_MODEL,
< G_SIGNAL_RUN_FIRST,
< closure,
< NULL, NULL,
< _gtk_marshal_VOID__BOXED_BOXED_POINTER,
< G_TYPE_NONE, 3,
< rows_reordered_params);
---
> g_signal_new ("rows_reordered",
> GTK_TYPE_TREE_MODEL,
> G_SIGNAL_RUN_FIRST,
> G_STRUCT_OFFSET (GtkTreeModelIface, rows_reordered),
> NULL, NULL,
> _gtk_marshal_VOID__BOXED_BOXED_POINTER,
> G_TYPE_NONE, 3,
> GTK_TYPE_TREE_PATH,
> GTK_TYPE_TREE_ITER,
> G_TYPE_POINTER);
>

View file

@ -1,58 +1,58 @@
173,180c173,181
< g_signal_newv ("row_inserted",
< GTK_TYPE_TREE_MODEL,
< G_SIGNAL_RUN_FIRST,
< closure,
< NULL, NULL,
< _gtk_marshal_VOID__BOXED_BOXED,
< G_TYPE_NONE, 2,
< row_inserted_params);
---
> g_signal_new ("row_inserted",
> GTK_TYPE_TREE_MODEL,
> G_SIGNAL_RUN_FIRST,
> G_STRUCT_OFFSET (GtkTreeModelIface, row_inserted),
> NULL, NULL,
> _gtk_marshal_VOID__BOXED_BOXED,
> G_TYPE_NONE, 2,
> GTK_TYPE_TREE_PATH,
> GTK_TYPE_TREE_ITER);
196,203c197,204
< g_signal_newv ("row_deleted",
< GTK_TYPE_TREE_MODEL,
< G_SIGNAL_RUN_FIRST,
< closure,
< NULL, NULL,
< _gtk_marshal_VOID__BOXED,
< G_TYPE_NONE, 1,
< row_deleted_params);
---
> g_signal_new ("row_deleted",
> GTK_TYPE_TREE_MODEL,
> G_SIGNAL_RUN_FIRST,
> G_STRUCT_OFFSET (GtkTreeModelIface, row_deleted),
> NULL, NULL,
> _gtk_marshal_VOID__BOXED,
> G_TYPE_NONE, 1,
> GTK_TYPE_TREE_PATH);
208,215c209,219
< g_signal_newv ("rows_reordered",
< GTK_TYPE_TREE_MODEL,
< G_SIGNAL_RUN_FIRST,
< closure,
< NULL, NULL,
< _gtk_marshal_VOID__BOXED_BOXED_POINTER,
< G_TYPE_NONE, 3,
< rows_reordered_params);
---
> g_signal_new ("rows_reordered",
> GTK_TYPE_TREE_MODEL,
> G_SIGNAL_RUN_FIRST,
> G_STRUCT_OFFSET (GtkTreeModelIface, rows_reordered),
> NULL, NULL,
> _gtk_marshal_VOID__BOXED_BOXED_POINTER,
> G_TYPE_NONE, 3,
> GTK_TYPE_TREE_PATH,
> GTK_TYPE_TREE_ITER,
> G_TYPE_POINTER);
>
--- gtk+-2.14.3/gtk/gtktreemodel.c 2009-01-04 11:52:01.000000000 -0600
+++ gtktreemodel.c 2009-01-04 12:03:58.000000000 -0600
@@ -193,14 +193,15 @@
closure = g_closure_new_simple (sizeof (GClosure), NULL);
g_closure_set_marshal (closure, row_inserted_marshal);
tree_model_signals[ROW_INSERTED] =
- g_signal_newv (I_("row-inserted"),
+ g_signal_new (I_("row-inserted"),
GTK_TYPE_TREE_MODEL,
G_SIGNAL_RUN_FIRST,
- closure,
+ G_STRUCT_OFFSET (GtkTreeModelIface, row_inserted),
NULL, NULL,
_gtk_marshal_VOID__BOXED_BOXED,
G_TYPE_NONE, 2,
- row_inserted_params);
+ GTK_TYPE_TREE_PATH | G_SIGNAL_TYPE_STATIC_SCOPE,
+ GTK_TYPE_TREE_ITER);
/**
* GtkTreeModel::row-has-child-toggled:
@@ -242,14 +243,14 @@
closure = g_closure_new_simple (sizeof (GClosure), NULL);
g_closure_set_marshal (closure, row_deleted_marshal);
tree_model_signals[ROW_DELETED] =
- g_signal_newv (I_("row-deleted"),
+ g_signal_new (I_("row-deleted"),
GTK_TYPE_TREE_MODEL,
G_SIGNAL_RUN_FIRST,
- closure,
+ G_STRUCT_OFFSET (GtkTreeModelIface, row_deleted),
NULL, NULL,
_gtk_marshal_VOID__BOXED,
G_TYPE_NONE, 1,
- row_deleted_params);
+ GTK_TYPE_TREE_PATH);
/**
* GtkTreeModel::rows-reordered:
@@ -268,14 +269,15 @@
closure = g_closure_new_simple (sizeof (GClosure), NULL);
g_closure_set_marshal (closure, rows_reordered_marshal);
tree_model_signals[ROWS_REORDERED] =
- g_signal_newv (I_("rows-reordered"),
+ g_signal_new (I_("rows-reordered"),
GTK_TYPE_TREE_MODEL,
G_SIGNAL_RUN_FIRST,
- closure,
+ G_STRUCT_OFFSET (GtkTreeModelIface, rows_reordered),
NULL, NULL,
_gtk_marshal_VOID__BOXED_BOXED_POINTER,
G_TYPE_NONE, 3,
- rows_reordered_params);
+ GTK_TYPE_TREE_PATH | G_SIGNAL_TYPE_STATIC_SCOPE,
+ GTK_TYPE_TREE_ITER, G_TYPE_POINTER);
initialized = TRUE;
}
}

View file

@ -1,12 +0,0 @@
--- gtkclipboard.h.orig 2005-03-18 15:41:55.748377369 -0500
+++ gtkclipboard.h 2005-03-18 15:45:36.752348627 -0500
@@ -32,6 +32,9 @@
#define GTK_CLIPBOARD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CLIPBOARD, GtkClipboard))
#define GTK_IS_CLIPBOARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CLIPBOARD))
+typedef struct _GtkClipboard GtkClipboard;
+typedef struct _GtkClipboardClass GtkClipboardClass;
+
typedef void (* GtkClipboardReceivedFunc) (GtkClipboard *clipboard,
GtkSelectionData *selection_data,
gpointer data);

View file

@ -1,51 +0,0 @@
Index: gtkhtml-3.0.10/src/gtkhtml-enums.h
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/gtkhtml-enums.h,v
retrieving revision 1.35
diff -u -p -r1.35 gtkhtml-enums.h
--- gtkhtml-3.0.10/src/gtkhtml-enums.h 19 May 2003 14:41:02 -0000 1.35
+++ gtkhtml-3.0.10/src/gtkhtml-enums.h 16 Jul 2003 02:06:40 -0000
@@ -242,15 +242,13 @@ typedef enum {
} GtkHTMLEtchStyle;
typedef enum {
- GTK_HTML_FONT_STYLE_SHIFT_FIRST = 3,
- GTK_HTML_FONT_STYLE_SHIFT_BOLD = GTK_HTML_FONT_STYLE_SHIFT_FIRST,
- GTK_HTML_FONT_STYLE_SHIFT_ITALIC,
- GTK_HTML_FONT_STYLE_SHIFT_UNDERLINE,
- GTK_HTML_FONT_STYLE_SHIFT_STRIKEOUT,
- GTK_HTML_FONT_STYLE_SHIFT_FIXED,
- GTK_HTML_FONT_STYLE_SHIFT_SUBSCRIPT,
- GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT,
- GTK_HTML_FONT_STYLE_SHIFT_LAST = GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT,
+ GTK_HTML_FONT_STYLE_SHIFT_BOLD = 3,
+ GTK_HTML_FONT_STYLE_SHIFT_ITALIC = 4,
+ GTK_HTML_FONT_STYLE_SHIFT_UNDERLINE = 5,
+ GTK_HTML_FONT_STYLE_SHIFT_STRIKEOUT = 6,
+ GTK_HTML_FONT_STYLE_SHIFT_FIXED = 7,
+ GTK_HTML_FONT_STYLE_SHIFT_SUBSCRIPT = 8,
+ GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT = 9,
} GtkHTMLFontStyleShift;
typedef enum {
@@ -263,13 +261,13 @@ typedef enum {
GTK_HTML_FONT_STYLE_SIZE_6 = 6,
GTK_HTML_FONT_STYLE_SIZE_7 = 7,
GTK_HTML_FONT_STYLE_SIZE_MASK = 0x7,
- GTK_HTML_FONT_STYLE_BOLD = 1 << GTK_HTML_FONT_STYLE_SHIFT_BOLD,
- GTK_HTML_FONT_STYLE_ITALIC = 1 << GTK_HTML_FONT_STYLE_SHIFT_ITALIC,
- GTK_HTML_FONT_STYLE_UNDERLINE = 1 << GTK_HTML_FONT_STYLE_SHIFT_UNDERLINE,
- GTK_HTML_FONT_STYLE_STRIKEOUT = 1 << GTK_HTML_FONT_STYLE_SHIFT_STRIKEOUT,
- GTK_HTML_FONT_STYLE_FIXED = 1 << GTK_HTML_FONT_STYLE_SHIFT_FIXED,
- GTK_HTML_FONT_STYLE_SUBSCRIPT = 1 << GTK_HTML_FONT_STYLE_SHIFT_SUBSCRIPT,
- GTK_HTML_FONT_STYLE_SUPERSCRIPT = 1 << GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT,
+ GTK_HTML_FONT_STYLE_BOLD = 1 << 3,
+ GTK_HTML_FONT_STYLE_ITALIC = 1 << 4,
+ GTK_HTML_FONT_STYLE_UNDERLINE = 1 << 5,
+ GTK_HTML_FONT_STYLE_STRIKEOUT = 1 << 6,
+ GTK_HTML_FONT_STYLE_FIXED = 1 << 7,
+ GTK_HTML_FONT_STYLE_SUBSCRIPT = 1 << 8,
+ GTK_HTML_FONT_STYLE_SUPERSCRIPT = 1 << 9,
} GtkHTMLFontStyle;
typedef enum {

View file

@ -1,15 +1,48 @@
<gapi-parser-input>
<api filename="../atk/atk-api-2.12.raw">
<library name="libatk-1.0-0.dll">
<namespace name="Atk">
<dir>atk-1.20.0/atk</dir>
<api filename="../gio/gio-api.raw">
<library name="libgio-2.0-0.dll">
<namespace name="G">
<directory path="glib-2.18.1/gio">
<exclude>gasynchelper.h</exclude>
<exclude>gcontenttypeprivate.h</exclude>
<exclude>gdummyfile.h</exclude>
<exclude>gfileattribute-priv.h</exclude>
<exclude>gioalias.h</exclude>
<exclude>gio-marshal.h</exclude>
<exclude>giomodule-priv.h</exclude>
<exclude>glocalfile.h</exclude>
<exclude>glocalfileinfo.h</exclude>
<exclude>glocalfileinputstream.h</exclude>
<exclude>glocalfilemonitor.h</exclude>
<exclude>glocalfileoutputstream.h</exclude>
<exclude>glocalvfs.h</exclude>
<exclude>gmountprivate.h</exclude>
<exclude>gpollfilemonitor.h</exclude>
<exclude>gunionvolumemonitor.h</exclude>
<exclude>gunixinputstream.h</exclude>
<exclude>gunixmount.h</exclude>
<exclude>gunixmounts.h</exclude>
<exclude>gunixoutputstream.h</exclude>
<exclude>gunixvolume.h</exclude>
<exclude>gunixvolumemonitor.h</exclude>
<exclude>gwin32appinfo.h</exclude>
<exclude>gwin32mount.h</exclude>
<exclude>gwin32volumemonitor.h</exclude>
</directory>
</namespace>
</library>
</api>
<api filename="../pango/pango-api-2.12.raw">
<api filename="../atk/atk-api-2.14.raw">
<library name="libatk-1.0-0.dll">
<namespace name="Atk">
<dir>atk-1.24.0/atk</dir>
</namespace>
</library>
</api>
<api filename="../pango/pango-api-2.14.raw">
<library name="libpango-1.0-0.dll">
<namespace name="Pango">
<directory path="pango-1.18.2/pango">
<directory path="pango-1.22.0/pango">
<exclude>pangoatsui.c</exclude>
<exclude>pangoatsui.h</exclude>
<exclude>pangoatsui-fontmap.h</exclude>
@ -47,18 +80,23 @@
</namespace>
</library>
</api>
<api filename="../gdk/gdk-api-2.12.raw">
<api filename="../gdk/gdk-api-2.14.raw">
<library name="libgdk-win32-2.0-0.dll">
<namespace name="Gdk">
<directory path="gtk+-2.12.0/gdk">
<directory path="gtk+-2.14.3/gdk">
<exclude>gdkalias.h</exclude>
<exclude>gdkwindowimpl.h</exclude>
<exclude>keyname-table.h</exclude>
</directory>
</namespace>
</library>
<library name="libgdk_pixbuf-2.0-0.dll">
<namespace name="Gdk">
<directory path="gtk+-2.12.0/gdk-pixbuf">
<directory path="gtk+-2.14.3/gdk-pixbuf">
<exclude>io-gdip-native.h</exclude>
<exclude>io-gdip-propertytags.h</exclude>
<exclude>io-gdip-utils.h</exclude>
<exclude>io-gdip-animation.h</exclude>
<exclude>gdk-pixbuf-alias.h</exclude>
<exclude>gdk-pixbuf-scaled-anim.h</exclude>
<exclude>xpm-color-table.h</exclude>
@ -66,10 +104,10 @@
</namespace>
</library>
</api>
<api filename="../gtk/gtk-api-2.12.raw">
<api filename="../gtk/gtk-api-2.14.raw">
<library name="libgtk-win32-2.0-0.dll">
<namespace name="Gtk">
<directory path="gtk+-2.12.0/gtk">
<directory path="gtk+-2.14.3/gtk">
<!-- Internal stuff -->
<exclude>gtkalias.h</exclude>
<exclude>gtkbuiltincache.h</exclude>
@ -97,6 +135,7 @@
<exclude>gtkiconcachevalidator.c</exclude>
<exclude>gtkiconcachevalidator.h</exclude>
<exclude>gtkiconthemeparser.h</exclude>
<exclude>gtkimcontextsimpleseqs.h</exclude>
<exclude>gtkpathbar.c</exclude>
<exclude>gtkpathbar.h</exclude>
<exclude>gtkprintbackend.h</exclude>
@ -164,10 +203,10 @@
</namespace>
</library>
</api>
<api filename="../glade/glade-api-2.12.raw">
<api filename="../glade/glade-api-2.14.raw">
<library name="libglade-2.0-0.dll">
<namespace name="Glade">
<dir>libglade-2.6.2/glade</dir>
<dir>libglade-2.6.3/glade</dir>
</namespace>
</library>
</api>