2006-05-10 Mike Kestner <mkestner@novell.com>

* bootstrap-2.10 : strap for the new 2.9.0 API.
	* generator/SymbolTable.cs : add GLib.InitiallyUnowned mapping.
	* glib/InitiallyUnowned.cs : new floating class "stub".
	* glib/Makefile.am : build new class.
	* gdk/gdk-api-2.10.raw: parse from 2.9.0
	* gtk/Gtk.metadata: cleanup conflicts in 2.10 API.
	* gtk/gtk-api-2.10.raw: parse from 2.9.0
	* pango/pango-api-2.10.raw: parse from 1.11.99
	* sources/Makefile.am : 2.10 parse setup and api-2.10 
	* sources/gtk_tree_model_signal_fix-2.10.patch : 2.10 patch.
	* sources/gtk-sharp-2.10-sources.xml : parse rules for 2.10

svn path=/trunk/gtk-sharp/; revision=60521
This commit is contained in:
Mike Kestner 2006-05-10 17:13:30 +00:00
parent c588660a96
commit 2ac6bb5457
13 changed files with 3661 additions and 81 deletions

View file

@ -1,3 +1,17 @@
2006-05-10 Mike Kestner <mkestner@novell.com>
* bootstrap-2.10 : strap for the new 2.9.0 API.
* generator/SymbolTable.cs : add GLib.InitiallyUnowned mapping.
* glib/InitiallyUnowned.cs : new floating class "stub".
* glib/Makefile.am : build new class.
* gdk/gdk-api-2.10.raw: parse from 2.9.0
* gtk/Gtk.metadata: cleanup conflicts in 2.10 API.
* gtk/gtk-api-2.10.raw: parse from 2.9.0
* pango/pango-api-2.10.raw: parse from 1.11.99
* sources/Makefile.am : 2.10 parse setup and api-2.10
* sources/gtk_tree_model_signal_fix-2.10.patch : 2.10 patch.
* sources/gtk-sharp-2.10-sources.xml : parse rules for 2.10
2006-05-08 Joe Shaw <joeshaw@novell.com>
* glib/ValueArray.cs: Don't immediately free ValueArrays; queue

View file

@ -1,12 +1,11 @@
<?xml version="1.0"?>
<api>
<!--
<api
><!--
This file was automatically generated.
Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-->
<namespace name="Atk" library="libatk-1.0-0.dll">
--><namespace name="Atk" library="libatk-1.0-0.dll">
<enum name="CoordType" cname="AtkCoordType" gtype="atk_coord_type_get_type" type="enum">
<member cname="ATK_XY_SCREEN" name="Screen" />
<member cname="ATK_XY_WINDOW" name="Window" />
@ -2604,6 +2603,4 @@
<parameter type="const-gchar*" name="name" />
</parameters>
</method>
</class>
</namespace>
</api>
</class></namespace></api>

14
bootstrap-2.10 Executable file
View file

@ -0,0 +1,14 @@
#!/bin/sh
# Run this to set configure.in up for an API version.
GTK_SHARP_VERSION=2.9.0
ASSEMBLY_VERSION=2.10.0.0
POLICY_VERSIONS="2.4 2.6 2.8"
GTK_REQUIRED_VERSION=2.9.0
GNOME_REQUIRED_VERSION=2.10.0
VERSIONCSDEFINES="-define:GTK_SHARP_2_6 -define:GTK_SHARP_2_8 -define:GTK_SHARP_2_10"
VERSIONCFLAGS="-DGTK_SHARP_2_6 -DGTK_SHARP_2_8 -DGTK_SHARP_2_10"
GTK_API_TAG=2.10
GNOME_API_TAG=2.10
. ./bootstrap-generic "$@"

View file

@ -1,12 +1,11 @@
<?xml version="1.0"?>
<api>
<!--
<api
><!--
This file was automatically generated.
Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-->
<namespace name="Gdk" library="libgdk-win32-2.0-0.dll">
--><namespace name="Gdk" library="libgdk-win32-2.0-0.dll">
<enum name="AxisUse" cname="GdkAxisUse" gtype="gdk_axis_use_get_type" type="enum">
<member cname="GDK_AXIS_IGNORE" name="Ignore" />
<member cname="GDK_AXIS_X" name="X" />
@ -319,8 +318,11 @@
<member cname="GDK_BUTTON3_MASK" name="Button3Mask" value="1 &lt;&lt; 10" />
<member cname="GDK_BUTTON4_MASK" name="Button4Mask" value="1 &lt;&lt; 11" />
<member cname="GDK_BUTTON5_MASK" name="Button5Mask" value="1 &lt;&lt; 12" />
<member cname="GDK_SUPER_MASK" name="SuperMask" value="1 &lt;&lt; 26" />
<member cname="GDK_HYPER_MASK" name="HyperMask" value="1 &lt;&lt; 27" />
<member cname="GDK_META_MASK" name="MetaMask" value="1 &lt;&lt; 28" />
<member cname="GDK_RELEASE_MASK" name="ReleaseMask" value="1 &lt;&lt; 30" />
<member cname="GDK_MODIFIER_MASK" name="ModifierMask" value="GDK_RELEASE_MASK | 0x1fff" />
<member cname="GDK_MODIFIER_MASK" name="ModifierMask" value="0x5c001fff" />
</enum>
<enum name="NotifyType" cname="GdkNotifyType" gtype="gdk_notify_type_get_type" type="enum">
<member cname="GDK_NOTIFY_ANCESTOR" name="Ancestor" />
@ -467,6 +469,12 @@
<member cname="GDK_WINDOW_TYPE_HINT_UTILITY" name="Utility" />
<member cname="GDK_WINDOW_TYPE_HINT_DOCK" name="Dock" />
<member cname="GDK_WINDOW_TYPE_HINT_DESKTOP" name="Desktop" />
<member cname="GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU" name="DropdownMenu" />
<member cname="GDK_WINDOW_TYPE_HINT_POPUP_MENU" name="PopupMenu" />
<member cname="GDK_WINDOW_TYPE_HINT_TOOLTIP" name="Tooltip" />
<member cname="GDK_WINDOW_TYPE_HINT_NOTIFICATION" name="Notification" />
<member cname="GDK_WINDOW_TYPE_HINT_COMBO" name="Combo" />
<member cname="GDK_WINDOW_TYPE_HINT_DND" name="Dnd" />
</enum>
<callback name="DestroyNotify" cname="GdkDestroyNotify">
<return-type type="void" />
@ -847,9 +855,15 @@
<method name="SupportsCursorColor" cname="gdk_display_supports_cursor_color">
<return-type type="gboolean" />
</method>
<method name="SupportsInputShapes" cname="gdk_display_supports_input_shapes">
<return-type type="gboolean" />
</method>
<method name="SupportsSelectionNotification" cname="gdk_display_supports_selection_notification">
<return-type type="gboolean" />
</method>
<method name="SupportsShapes" cname="gdk_display_supports_shapes">
<return-type type="gboolean" />
</method>
<method name="Sync" cname="gdk_display_sync">
<return-type type="void" />
</method>
@ -2000,6 +2014,16 @@
<parameter type="GdkNativeWindow" name="anid" />
</parameters>
</method>
<method name="ForeignNewForScreen" cname="gdk_pixmap_foreign_new_for_screen" shared="true">
<return-type type="GdkPixmap*" />
<parameters>
<parameter type="GdkScreen*" name="screen" />
<parameter type="GdkNativeWindow" name="anid" />
<parameter type="gint" name="width" />
<parameter type="gint" name="height" />
<parameter type="gint" name="depth" />
</parameters>
</method>
<method name="GetType" cname="gdk_pixmap_get_type" shared="true">
<return-type type="GType" />
</method>
@ -2031,18 +2055,29 @@
<field name="ExposureGcs" cname="exposure_gcs" array_len="32" type="GdkGC*" />
<field name="FontOptions" cname="font_options" type="cairo_font_options_t*" />
<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">
<return-type type="void" />
<parameters>
<parameter type="GdkScreen*" name="screen" />
</parameters>
</signal>
<signal name="CompositedChanged" cname="composited_changed" when="LAST">
<return-type type="void" />
<parameters>
<parameter type="GdkScreen*" name="screen" />
</parameters>
</signal>
<method name="BroadcastClientMessage" cname="gdk_screen_broadcast_client_message">
<return-type type="void" />
<parameters>
<parameter type="GdkEvent*" name="event" />
</parameters>
</method>
<method name="GetActiveWindow" cname="gdk_screen_get_active_window">
<return-type type="GdkWindow*" />
</method>
<method name="GetDefault" cname="gdk_screen_get_default" shared="true">
<return-type type="GdkScreen*" />
</method>
@ -2052,7 +2087,7 @@
<method name="GetDisplay" cname="gdk_screen_get_display">
<return-type type="GdkDisplay*" />
</method>
<method name="GetFontOptionsLibgtkOnly" cname="gdk_screen_get_font_options_libgtk_only">
<method name="GetFontOptions" cname="gdk_screen_get_font_options">
<return-type type="const-cairo_font_options_t*" />
</method>
<method name="GetHeight" cname="gdk_screen_get_height">
@ -2087,7 +2122,7 @@
<method name="GetNumber" cname="gdk_screen_get_number">
<return-type type="gint" />
</method>
<method name="GetResolutionLibgtkOnly" cname="gdk_screen_get_resolution_libgtk_only">
<method name="GetResolution" cname="gdk_screen_get_resolution">
<return-type type="gdouble" />
</method>
<method name="GetRgbColormap" cname="gdk_screen_get_rgb_colormap">
@ -2130,12 +2165,18 @@
<method name="GetWidthMm" cname="gdk_screen_get_width_mm">
<return-type type="gint" />
</method>
<method name="GetWindowStack" cname="gdk_screen_get_window_stack">
<return-type type="GList*" />
</method>
<method name="Height" cname="gdk_screen_height" shared="true">
<return-type type="gint" />
</method>
<method name="HeightMm" cname="gdk_screen_height_mm" shared="true">
<return-type type="gint" />
</method>
<method name="IsComposited" cname="gdk_screen_is_composited">
<return-type type="gboolean" />
</method>
<method name="ListVisuals" cname="gdk_screen_list_visuals">
<return-type type="GList*" />
</method>
@ -2148,13 +2189,13 @@
<parameter type="GdkColormap*" name="colormap" />
</parameters>
</method>
<method name="SetFontOptionsLibgtkOnly" cname="gdk_screen_set_font_options_libgtk_only">
<method name="SetFontOptions" cname="gdk_screen_set_font_options">
<return-type type="void" />
<parameters>
<parameter type="const-cairo_font_options_t*" name="options" />
</parameters>
</method>
<method name="SetResolutionLibgtkOnly" cname="gdk_screen_set_resolution_libgtk_only">
<method name="SetResolution" cname="gdk_screen_set_resolution">
<return-type type="void" />
<parameters>
<parameter type="gdouble" name="dpi" />
@ -2425,6 +2466,9 @@
<method name="GetToplevels" cname="gdk_window_get_toplevels" shared="true">
<return-type type="GList*" />
</method>
<method name="GetTypeHint" cname="gdk_window_get_type_hint">
<return-type type="GdkWindowTypeHint" />
</method>
<method name="GetUpdateArea" cname="gdk_window_get_update_area">
<return-type type="GdkRegion*" />
</method>
@ -2443,6 +2487,22 @@
<method name="Iconify" cname="gdk_window_iconify">
<return-type type="void" />
</method>
<method name="InputShapeCombineMask" cname="gdk_window_input_shape_combine_mask">
<return-type type="void" />
<parameters>
<parameter type="GdkBitmap*" name="mask" />
<parameter type="gint" name="x" />
<parameter type="gint" name="y" />
</parameters>
</method>
<method name="InputShapeCombineRegion" cname="gdk_window_input_shape_combine_region">
<return-type type="void" />
<parameters>
<parameter type="GdkRegion*" name="shape_region" />
<parameter type="gint" name="offset_x" />
<parameter type="gint" name="offset_y" />
</parameters>
</method>
<method name="InvalidateMaybeRecurse" cname="gdk_window_invalidate_maybe_recurse">
<return-type type="void" />
<parameters>
@ -2490,6 +2550,9 @@
<method name="Maximize" cname="gdk_window_maximize">
<return-type type="void" />
</method>
<method name="MergeChildInputShapes" cname="gdk_window_merge_child_input_shapes">
<return-type type="void" />
</method>
<method name="MergeChildShapes" cname="gdk_window_merge_child_shapes">
<return-type type="void" />
</method>
@ -2590,6 +2653,9 @@
<parameter type="const-GdkColor*" name="color" />
</parameters>
</method>
<method name="SetChildInputShapes" cname="gdk_window_set_child_input_shapes">
<return-type type="void" />
</method>
<method name="SetChildShapes" cname="gdk_window_set_child_shapes">
<return-type type="void" />
</method>
@ -3054,6 +3120,7 @@
<field name="String" cname="string" type="gchar*" />
<field name="HardwareKeycode" cname="hardware_keycode" type="guint16" />
<field name="Group" cname="group" type="guint8" />
<field name="IsModifier" cname="is_modifier" bits="1" type="guint" />
</struct>
<struct name="EventMotion" cname="GdkEventMotion">
<field name="Type" cname="type" type="GdkEventType" />
@ -3362,7 +3429,7 @@
<method name="RectIn" cname="gdk_region_rect_in">
<return-type type="GdkOverlapType" />
<parameters>
<parameter type="GdkRectangle*" name="rect" />
<parameter type="GdkRectangle*" name="rectangle" />
</parameters>
</method>
<method name="Rectangle" cname="gdk_region_rectangle" shared="true">
@ -3519,6 +3586,12 @@
<parameter type="gboolean" name="only_if_exists" />
</parameters>
</method>
<method name="InternStaticString" cname="gdk_atom_intern_static_string" shared="true">
<return-type type="GdkAtom" />
<parameters>
<parameter type="const-gchar*" name="atom_name" />
</parameters>
</method>
<method name="Name" cname="gdk_atom_name">
<return-type type="gchar*" />
</method>
@ -3748,6 +3821,15 @@
<parameter type="double" name="pixbuf_y" />
</parameters>
</method>
<method name="SetSourcePixmap" cname="gdk_cairo_set_source_pixmap" shared="true">
<return-type type="void" />
<parameters>
<parameter type="cairo_t*" name="cr" />
<parameter type="GdkPixmap*" name="pixmap" />
<parameter type="double" name="pixmap_x" />
<parameter type="double" name="pixmap_y" />
</parameters>
</method>
</class>
<class name="Char" cname="GdkChar_">
<method name="Height" cname="gdk_char_height" deprecated="1" shared="true">
@ -4691,9 +4773,7 @@
<parameter type="GCallback" name="leave_fn" />
</parameters>
</method>
</class>
</namespace>
<namespace name="Gdk" library="libgdk_pixbuf-2.0-0.dll">
</class></namespace><namespace name="Gdk" library="libgdk_pixbuf-2.0-0.dll">
<enum name="Colorspace" cname="GdkColorspace" gtype="gdk_colorspace_get_type" type="enum">
<member cname="GDK_COLORSPACE_RGB" name="Rgb" />
</enum>
@ -5374,6 +5454,4 @@
<parameter type="GdkPixdataDumpType" name="dump_type" />
</parameters>
</method>
</struct>
</namespace>
</api>
</struct></namespace></api>

View file

@ -98,6 +98,7 @@ namespace GtkSharp.Generation {
AddType (new SimpleGen ("GStrv", "string[]"));
// manually wrapped types requiring more complex marshaling
AddType (new ManualGen ("GInitiallyUnowned", "GLib.InitiallyUnowned", "GLib.Object.GetObject ({0})"));
AddType (new ManualGen ("GObject", "GLib.Object", "GLib.Object.GetObject ({0})"));
AddType (new ManualGen ("GList", "GLib.List"));
AddType (new ManualGen ("GSList", "GLib.SList"));

46
glib/InitiallyUnowned.cs Normal file
View file

@ -0,0 +1,46 @@
// InitiallyUnowned.cs - GInitiallyUnowned class wrapper implementation
//
// Authors: Mike Kestner <mkestner@novell.com>
//
// Copyright (c) 2004-2005 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.
#if GTK_SHARP_2_10
namespace GLib {
using System;
using System.Collections;
using System.ComponentModel;
using System.Runtime.InteropServices;
public class InitiallyUnowned : Object {
protected InitiallyUnowned (IntPtr raw) : base (raw) {}
[Obsolete]
protected InitiallyUnowned (GType gtype) : base (gtype) {}
public new static GLib.GType GType {
get {
return GType.Object;
}
}
}
}
#endif

View file

@ -31,6 +31,7 @@ sources = \
GType.cs \
GTypeAttribute.cs \
Idle.cs \
InitiallyUnowned.cs \
IWrapper.cs \
ListBase.cs \
List.cs \

View file

@ -109,6 +109,9 @@
<attr path="/api/namespace/enum[@cname='GtkRcFlags']" name="hidden">1</attr>
<attr path="/api/namespace/enum[@cname='GtkRcTokenType']" name="hidden">1</attr>
<attr path="/api/namespace/enum[@cname='GtkSignalRunType']" name="hidden">1</attr>
<attr path="/api/namespace/enum[@cname='GtkTextBufferTargetInfo']/member[@name='BufferContents']" name="value">UInt32.MaxValue-0U</attr>
<attr path="/api/namespace/enum[@cname='GtkTextBufferTargetInfo']/member[@name='RichText']" name="value">UInt32.MaxValue-1U</attr>
<attr path="/api/namespace/enum[@cname='GtkTextBufferTargetInfo']/member[@name='Text']" name="value">UInt32.MaxValue-2U</attr>
<attr path="/api/namespace/enum[@cname='GtkToolbarSpaceStyle']" name="hidden">1</attr>
<attr path="/api/namespace/enum[@cname='GtkVisibility']" name="hidden">1</attr>
<attr path="/api/namespace/enum[@cname='GtkWin32EmbedMessageType']" name="hidden">1</attr>
@ -415,6 +418,10 @@
<attr path="/api/namespace/object[@cname='GtkObject']/signal[@name='Destroy']" name="name">Destroyed</attr>
<attr path="/api/namespace/object[@cname='GtkPlug']/constructor[@cname='gtk_plug_new']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkPlug']/constructor[@cname='gtk_plug_new_for_display']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkPrinter']/method[@name='IsActive']" name="name">GetIsActive</attr>
<attr path="/api/namespace/object[@cname='GtkPrinter']/method[@name='IsDefault']" name="name">GetIsDefault</attr>
<attr path="/api/namespace/object[@cname='GtkPrinter']/method[@name='IsNew']" name="name">GetIsNew</attr>
<attr path="/api/namespace/object[@cname='GtkPrinter']/method[@name='IsVirtual']" name="name">GetIsVirtual</attr>
<attr path="/api/namespace/object[@cname='GtkProgressBar']" name="parent">GtkWidget</attr>
<attr path="/api/namespace/object[@cname='GtkRadioButton']/constructor[@cname='gtk_radio_button_new']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkRadioButton']/constructor[@cname='gtk_radio_button_new_with_label_from_widget']" name="hidden">1</attr>
@ -431,6 +438,9 @@
<attr path="/api/namespace/object[@cname='GtkRcStyle']/method[@name='Ref']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkRcStyle']/method[@name='Unref']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkReadyEvent']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkRecentChooserMenu']/method[@name='GetShowNumbers']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkRecentChooserMenu']/method[@name='SetShowNumbers']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GtkRecentChooserMenu']/property[@name='ShowNumbers']" name="hidden">1</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>

File diff suppressed because it is too large Load diff

View file

@ -1,12 +1,11 @@
<?xml version="1.0"?>
<api>
<!--
<api
><!--
This file was automatically generated.
Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-->
<namespace name="Pango" library="libpango-1.0-0.dll">
--><namespace name="Pango" library="libpango-1.0-0.dll">
<enum name="Alignment" cname="PangoAlignment" gtype="pango_alignment_get_type" type="enum">
<member cname="PANGO_ALIGN_LEFT" name="Left" />
<member cname="PANGO_ALIGN_CENTER" name="Center" />
@ -546,6 +545,15 @@
<method name="GetWrap" cname="pango_layout_get_wrap">
<return-type type="PangoWrapMode" />
</method>
<method name="IndexToLineX" cname="pango_layout_index_to_line_x">
<return-type type="void" />
<parameters>
<parameter type="int" name="index_" />
<parameter type="gboolean" name="trailing" />
<parameter type="int*" name="line" />
<parameter type="int*" name="x_pos" />
</parameters>
</method>
<method name="IndexToPos" cname="pango_layout_index_to_pos">
<return-type type="void" />
<parameters>
@ -1645,6 +1653,9 @@
<method name="Free" cname="pango_matrix_free">
<return-type type="void" />
</method>
<method name="GetFontScaleFactor" cname="pango_matrix_get_font_scale_factor">
<return-type type="double" />
</method>
<method name="GetType" cname="pango_matrix_get_type" shared="true">
<return-type type="GType" />
</method>
@ -1917,6 +1928,12 @@
<parameter type="gunichar*" name="mirrored_ch" />
</parameters>
</method>
<method name="IsZeroWidth" cname="pango_is_zero_width" shared="true">
<return-type type="gboolean" />
<parameters>
<parameter type="gunichar" name="ch" />
</parameters>
</method>
<method name="ItemizeWithBaseDir" cname="pango_itemize_with_base_dir" shared="true">
<return-type type="GList*" />
<parameters>
@ -2043,6 +2060,4 @@
<parameter type="gunichar" name="ch" />
</parameters>
</method>
</class>
</namespace>
</api>
</class></namespace></api>

View file

@ -5,6 +5,7 @@ EXTRA_DIST = \
gtk-sharp-2.8-sources.xml \
gtkclipboard.patch \
gtk_tree_model_signal_fix.patch \
gtk_tree_model_signal_fix-2.10.patch \
gtkhtml-font-style-enum.patch
@ -44,6 +45,18 @@ GTK_2_8_DOWNLOADS = \
http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.0/sources/libgnomeprintui-2.10.0.1.tar.bz2 \
http://ftp.gnome.org/pub/GNOME/desktop/2.10/2.10.0/sources/gnome-panel-2.10.0.tar.bz2
GTK_2_10_DOWNLOADS = \
ftp://ftp.gtk.org/pub/gtk/v2.9/pango-1.11.99.tar.bz2 \
ftp://ftp.gtk.org/pub/gtk/v2.8/atk-1.10.3.tar.bz2 \
ftp://ftp.gtk.org/pub/gtk/v2.9/gtk+-2.9.0.tar.bz2 \
http://ftp.gnome.org/pub/GNOME/platform/2.15/2.15.1/sources/gnome-vfs-2.14.1.tar.bz2 \
http://ftp.gnome.org/pub/GNOME/platform/2.15/2.15.1/sources/libgnome-2.14.1.tar.bz2 \
http://ftp.gnome.org/pub/GNOME/platform/2.15/2.15.1/sources/libgnomecanvas-2.14.0.tar.bz2 \
http://ftp.gnome.org/pub/GNOME/platform/2.15/2.15.1/sources/libgnomeui-2.14.1.tar.bz2 \
http://ftp.gnome.org/pub/GNOME/desktop/2.15/2.15.1/sources/libgnomeprint-2.12.1.tar.bz2 \
http://ftp.gnome.org/pub/GNOME/desktop/2.15/2.15.1/sources/libgnomeprintui-2.12.1.tar.bz2 \
http://ftp.gnome.org/pub/GNOME/desktop/2.15/2.15.1/sources/gnome-panel-2.14.1.tar.bz2
GNOME_DOWNLOADS = \
http://ftp.gnome.org/pub/GNOME/desktop/2.6/2.6.0/sources/libglade-2.3.6.tar.bz2 \
http://ftp.gnome.org/pub/GNOME/desktop/2.6/2.6.0/sources/libart_lgpl-2.3.16.tar.bz2 \
@ -60,7 +73,7 @@ GTKHTML_SOURCEFILES = \
gtkhtml-3.0.10/src/gtkhtml-stream.c \
gtkhtml-3.0.10/src/gtkhtml-stream.h
api: api-2.4 api-2.6 api-2.8
api: api-2.4 api-2.6 api-2.8 api-2.10
api-2.4:
PATH=../parser:$$PATH $(RUNTIME) ../parser/gapi-parser.exe gtk-sharp-2.4-sources.xml
@ -71,7 +84,10 @@ api-2.6:
api-2.8:
PATH=../parser:$$PATH $(RUNTIME) ../parser/gapi-parser.exe gtk-sharp-2.8-sources.xml
get-source-code: get-2.4-sources get-2.6-sources get-2.8-sources get-gnome-sources get-gtkhtml-code
api-2.10:
PATH=../parser:$$PATH $(RUNTIME) ../parser/gapi-parser.exe gtk-sharp-2.10-sources.xml
get-source-code: get-2.4-sources get-2.6-sources get-2.8-sources get-2.10-sources get-gnome-sources get-gtkhtml-code
get-gtkhtml-code:
wget http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/3.0/gtkhtml-3.0.10.tar.bz2 --output-document=- | tar -xj $(GTKHTML_SOURCEFILES)
@ -100,6 +116,15 @@ get-2.8-sources:
patch -p0 gtk+-2.8.9/gtk/gtktreemodel.c < gtk_tree_model_signal_fix.patch
patch -p0 gtk+-2.8.9/gtk/gtkclipboard.h < gtkclipboard.patch
get-2.10-sources:
for i in $(GTK_2_10_DOWNLOADS); do \
wget $$i --output-document=- | tar -xj ; \
done;
ln -f -s gtkfilechooserprivate.h gtk+-2.9.0/gtk/gtkfilechooserpriv.h
patch -p0 gtk+-2.9.0/gtk/gtktreemodel.c < gtk_tree_model_signal_fix-2.10.patch
echo "typedef struct _GtkClipboard GtkClipboard;" >> gtk+-2.9.0/gtk/gtkclipboard.h
echo "typedef struct _GtkClipboardClass GtkClipboardClass;" >> gtk+-2.9.0/gtk/gtkclipboard.h
get-gnome-sources:
for i in $(GNOME_DOWNLOADS); do \
wget $$i --output-document=- | tar -xj ; \

View file

@ -0,0 +1,262 @@
<gapi-parser-input>
<api filename="../atk/atk-api-2.10.raw">
<library name="libatk-1.0-0.dll">
<namespace name="Atk">
<dir>atk-1.10.3/atk</dir>
</namespace>
</library>
</api>
<api filename="../pango/pango-api-2.10.raw">
<library name="libpango-1.0-0.dll">
<namespace name="Pango">
<directory path="pango-1.11.99/pango">
<exclude>pangocairo.h</exclude>
<exclude>pangocairo-atsui.h</exclude>
<exclude>pangocairo-atsuifont.h</exclude>
<exclude>pangocairo-fc.h</exclude>
<exclude>pangocairo-win32.h</exclude>
<exclude>pangocairo-private.h</exclude>
<exclude>pangofc-decoder.c</exclude>
<exclude>pangofc-decoder.h</exclude>
<exclude>pangofc-font.c</exclude>
<exclude>pangofc-font.h</exclude>
<exclude>pangofc-fontmap.c</exclude>
<exclude>pangofc-fontmap.h</exclude>
<exclude>pangofc-private.h</exclude>
<exclude>pangox-fontcache.c</exclude>
<exclude>pangox-fontmap.c</exclude>
<exclude>pangox-private.h</exclude>
<exclude>pangox.h</exclude>
<exclude>pangox.c</exclude>
<exclude>pangoxft.h</exclude>
<exclude>pangoxft-font.c</exclude>
<exclude>pangoxft-font.h</exclude>
<exclude>pangoxft-fontmap.c</exclude>
<exclude>pangoxft-fontmap.h</exclude>
<exclude>pangoxft-private.h</exclude>
<exclude>pangoxft-render.c</exclude>
<exclude>pangoxft-render.h</exclude>
<exclude>pango-color-table.h</exclude>
<exclude>pango-impl-utils.h</exclude>
<exclude>pango-script-lang-table.h</exclude>
<exclude>pango-script-table.h</exclude>
</directory>
</namespace>
</library>
</api>
<api filename="../gdk/gdk-api-2.10.raw">
<library name="libgdk-win32-2.0-0.dll">
<namespace name="Gdk">
<directory path="gtk+-2.9.0/gdk">
<exclude>gdkalias.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.9.0/gdk-pixbuf">
<exclude>gdk-pixbuf-alias.h</exclude>
<exclude>xpm-color-table.h</exclude>
</directory>
</namespace>
</library>
</api>
<api filename="../gtk/gtk-api-2.10.raw">
<library name="libgtk-win32-2.0-0.dll">
<namespace name="Gtk">
<directory path="gtk+-2.9.0/gtk">
<!-- Internal stuff -->
<exclude>gtkalias.h</exclude>
<exclude>gtkbuiltincache.h</exclude>
<exclude>gtkdndcursors.h</exclude>
<exclude>gtkfilechooserdefault.c</exclude>
<exclude>gtkfilechooserdefault.h</exclude>
<exclude>gtkfilechooserembed.c</exclude>
<exclude>gtkfilechooserembed.h</exclude>
<exclude>gtkfilechooserentry.c</exclude>
<exclude>gtkfilechooserentry.h</exclude>
<exclude>gtkfilechooserutils.c</exclude>
<exclude>gtkfilechooserutils.h</exclude>
<exclude>gtkfilesystem.c</exclude>
<exclude>gtkfilesystem.h</exclude>
<exclude>gtkfilesystemmodel.c</exclude>
<exclude>gtkfilesystemmodel.h</exclude>
<exclude>gtkfilesystemunix.c</exclude>
<exclude>gtkfilesystemunix.h</exclude>
<exclude>gtkfilesystemwin32.c</exclude>
<exclude>gtkfilesystemwin32.h</exclude>
<exclude>gtkiconcache.c</exclude>
<exclude>gtkiconcache.h</exclude>
<exclude>gtkiconthemeparser.h</exclude>
<exclude>gtkpathbar.c</exclude>
<exclude>gtkpathbar.h</exclude>
<exclude>gtkrbtree.c</exclude>
<exclude>gtkrbtree.h</exclude>
<exclude>gtksequence.c</exclude>
<exclude>gtksequence.h</exclude>
<exclude>gtktextbtree.c</exclude>
<exclude>gtktextbtree.h</exclude>
<exclude>gtktextsegment.c</exclude>
<exclude>gtktextsegment.h</exclude>
<exclude>gtktexttypes.c</exclude>
<exclude>gtktexttypes.h</exclude>
<exclude>gtktextutil.c</exclude>
<exclude>gtktextutil.h</exclude>
<exclude>gtkthemes.c</exclude>
<exclude>gtkthemes.h</exclude>
<exclude>gtktreedatalist.c</exclude>
<exclude>gtktreedatalist.h</exclude>
<exclude>gtkwindow-decorate.c</exclude>
<exclude>gtkwindow-decorate.h</exclude>
<exclude>gtkxembed.h</exclude>
<exclude>xembed.h</exclude>
<!-- Exclude all pre gtk+-2.2 deprecated widgets -->
<exclude>gtkclist.c</exclude>
<exclude>gtkclist.h</exclude>
<exclude>gtkctree.c</exclude>
<exclude>gtkctree.h</exclude>
<exclude>gtklist.c</exclude>
<exclude>gtklist.h</exclude>
<exclude>gtklistitem.c</exclude>
<exclude>gtklistitem.h</exclude>
<exclude>gtkoldeditable.c</exclude>
<exclude>gtkoldeditable.h</exclude>
<exclude>gtkpixmap.c</exclude>
<exclude>gtkpixmap.h</exclude>
<exclude>gtkpreview.c</exclude>
<exclude>gtkpreview.h</exclude>
<exclude>gtkprogress.c</exclude>
<exclude>gtkprogress.h</exclude>
<exclude>gtktext.c</exclude>
<exclude>gtktext.h</exclude>
<exclude>gtktipsquery.c</exclude>
<exclude>gtktipsquery.h</exclude>
<exclude>gtktree.c</exclude>
<exclude>gtktree.h</exclude>
<exclude>gtktreeitem.c</exclude>
<exclude>gtktreeitem.h</exclude>
</directory>
</namespace>
</library>
</api>
<api filename="../gnomevfs/gnome-vfs-api-2.16.raw">
<library name="gnomevfs-2">
<namespace name="GnomeVFS">
<directory path="gnome-vfs-2.14.1/libgnomevfs">
<exclude>gnome-vfs-file-size.h</exclude>
<exclude>gnome-vfs-method.h</exclude>
<exclude>gnome-vfs-transform.h</exclude>
<!-- These files break the parser -->
<exclude>GNOME_VFS_Daemon-common.c</exclude>
<exclude>GNOME_VFS_Daemon.h</exclude>
<exclude>GNOME_VFS_Daemon-skels.c</exclude>
<exclude>GNOME_VFS_Daemon-stubs.c</exclude>
<exclude>gnome-vfs-job.c</exclude>
<exclude>gnome-vfs-job.h</exclude>
</directory>
</namespace>
</library>
</api>
<api filename="../gnome/gnome-api-2.16.raw">
<library name="gnome-2">
<namespace name="Gnome">
<dir>libgnome-2.14.1/libgnome</dir>
</namespace>
</library>
<library name="gnomecanvas-2">
<namespace name="Gnome">
<dir>libgnomecanvas-2.14.0/libgnomecanvas</dir>
</namespace>
</library>
<library name="gnomeui-2">
<namespace name="Gnome">
<directory path="libgnomeui-2.14.1/libgnomeui">
<!-- These were ignored in gtk# 1.0 due to a parser bug, but contain only deprecated methods -->
<exclude>gnome-app-util.h</exclude>
<exclude>gnome-dialog.h</exclude>
<exclude>gnome-dialog-util.h</exclude>
<exclude>gnome-mdi.h</exclude>
<exclude>gnome-mdi-child.h</exclude>
<exclude>gnome-mdi-generic-child.h</exclude>
<exclude>gnome-mdi-session.h</exclude>
<exclude>gnome-messagebox.h</exclude>
<exclude>gnome-pixmap.h</exclude>
<exclude>gnome-propertybox.h</exclude>
</directory>
</namespace>
</library>
<library name="gnomeprint-2-2">
<namespace name="Gnome">
<directory path="libgnomeprint-2.12.1/libgnomeprint">
<exclude>gnome-font-family.h</exclude>
<exclude>gnome-fontmap.h</exclude>
<exclude>gnome-print-encode.h</exclude>
<exclude>gnome-print-frgba.h</exclude>
<exclude>gnome-print-i18n.h</exclude>
<exclude>gnome-print-module.h</exclude>
<exclude>gnome-print-multipage.h</exclude>
<exclude>gnome-print-pdf.h</exclude>
<exclude>gnome-print-ps2.h</exclude>
<exclude>gnome-print-rbuf.h</exclude>
<exclude>gnome-print-rgbp.h</exclude>
<exclude>gp-path.h</exclude>
<exclude>gp-truetype-utils.h</exclude>
<exclude>gp-tt-t1.h</exclude>
</directory>
</namespace>
</library>
<library name="gnomeprintui-2-2">
<namespace name="Gnome">
<directory path="libgnomeprintui-2.12.1/libgnomeprintui">
<exclude>gnome-canvas-hacktext.h</exclude>
<exclude>gnome-print-copies.h</exclude>
<exclude>gnome-print-i18n.h</exclude>
<exclude>gnome-print-paper-preview.h</exclude>
<exclude>gnome-print-widget.h</exclude>
<exclude>gnome-printer-selector.h</exclude>
</directory>
</namespace>
</library>
<library name="panel-applet-2">
<namespace name="Gnome">
<dir>gnome-panel-2.14.1/libpanel-applet</dir>
</namespace>
</library>
</api>
<api filename="../gtkhtml/gtkhtml-api.raw">
<library name="gtkhtml-3.0">
<namespace name="Gtk">
<dir>gtkhtml-3.0.10/src</dir>
</namespace>
</library>
</api>
<api filename="../glade/glade-api.raw">
<library name="libglade-2.0-0.dll">
<namespace name="Glade">
<dir>libglade-2.3.6/glade</dir>
</namespace>
</library>
</api>
<api filename="../art/art-api.raw">
<library name="art_lgpl">
<namespace name="Art">
<dir>libart_lgpl-2.3.16</dir>
</namespace>
</library>
</api>
<api filename="../rsvg/rsvg-api.raw">
<library name="rsvg-2">
<namespace name="Rsvg">
<dir>librsvg-2.6.4</dir>
</namespace>
</library>
</api>
<api filename="../vte/vte-api.raw">
<library name="vte">
<namespace name="Vte">
<dir>vte-0.11.10/src</dir>
</namespace>
</library>
</api>
</gapi-parser-input>

View file

@ -0,0 +1,58 @@
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);
>