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

2003-07-14 Mike Kestner <mkestner@speakeasy.net>

Browse source 
* api/*-api.xml : regenerated
	* gdk/Drawable.custom : DrawRectangle filled param is now bool
	* generator/Parameters.cs : studlify names ending w/ uscore
	* gtk/GtkSharp.GtkClipboardClearFuncNative : s/Opaque/Object
	* gtk/GtkSharp.GtkClipboardGetFuncNative : s/Opaque/Object
	* parser/gapi2xml.pl : put <ns>_string_* methods in Global
	* sample/Scribble.cs : update to new DrawRectangle api
	* sources/Gdk.metadata : hide some conflicting methods
	* sources/Gtk.metadata : finally fix the Progress crap and
	renames, hides and such to fix conflicts
	* sources/README : mention new gtk-2.2 reqs
	* sources/gtk-sharp.sources : update to new gtk-2.2 reqs
	* sources/makefile : update for 2.2 api

svn path=/trunk/gtk-sharp/; revision=16254
This commit is contained in:
Mike Kestner 2003-07-15 05:52:09 +00:00
parent f98b4e6398
commit 90705a1c98
18 changed files with 1704 additions and 367 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ChangeLog
View file

@ -1,3 +1,19 @@
2003-07-14 Mike Kestner <mkestner@speakeasy.net>
* api/*-api.xml : regenerated
* gdk/Drawable.custom : DrawRectangle filled param is now bool
* generator/Parameters.cs : studlify names ending w/ uscore
* gtk/GtkSharp.GtkClipboardClearFuncNative : s/Opaque/Object
* gtk/GtkSharp.GtkClipboardGetFuncNative : s/Opaque/Object
* parser/gapi2xml.pl : put <ns>_string_* methods in Global
* sample/Scribble.cs : update to new DrawRectangle api
* sources/Gdk.metadata : hide some conflicting methods
* sources/Gtk.metadata : finally fix the Progress crap and
renames, hides and such to fix conflicts
* sources/README : mention new gtk-2.2 reqs
* sources/gtk-sharp.sources : update to new gtk-2.2 reqs
* sources/makefile : update for 2.2 api
2003-07-12 Mike Kestner <mkestner@speakeasy.net>
* api/gda-api.xml : hide the new Type class

63
api/atk-api.xml
View file

@ -11,6 +11,9 @@
<member cname="ATK_XY_SCREEN" name="Screen"/>
<member cname="ATK_XY_WINDOW" name="Window"/>
</enum>
<enum name="HyperlinkStateFlags" cname="AtkHyperlinkStateFlags" type="flags">
<member cname="ATK_HYPERLINK_IS_INLINE" name="Inline" value="1 &lt;&lt; 0"/>
</enum>
<enum name="KeyEventType" cname="AtkKeyEventType" type="enum">
<member cname="ATK_KEY_EVENT_PRESS" name="Press"/>
<member cname="ATK_KEY_EVENT_RELEASE" name="Release"/>
@ -24,6 +27,7 @@
<member cname="ATK_LAYER_MDI" name="Mdi"/>
<member cname="ATK_LAYER_POPUP" name="Popup"/>
<member cname="ATK_LAYER_OVERLAY" name="Overlay"/>
<member cname="ATK_LAYER_WINDOW" name="Window"/>
</enum>
<enum name="RelationType" cname="AtkRelationType" type="enum">
<member cname="ATK_RELATION_NULL" name="Null"/>
@ -33,6 +37,11 @@
<member cname="ATK_RELATION_LABELLED_BY" name="LabelledBy"/>
<member cname="ATK_RELATION_MEMBER_OF" name="MemberOf"/>
<member cname="ATK_RELATION_NODE_CHILD_OF" name="NodeChildOf"/>
<member cname="ATK_RELATION_FLOWS_TO" name="FlowsTo"/>
<member cname="ATK_RELATION_FLOWS_FROM" name="FlowsFrom"/>
<member cname="ATK_RELATION_SUBWINDOW_OF" name="SubwindowOf"/>
<member cname="ATK_RELATION_EMBEDS" name="Embeds"/>
<member cname="ATK_RELATION_EMBEDDED_BY" name="EmbeddedBy"/>
<member cname="ATK_RELATION_LAST_DEFINED" name="LastDefined"/>
</enum>
<enum name="Role" cname="AtkRole" type="enum">
@ -105,6 +114,11 @@
<member cname="ATK_ROLE_UNKNOWN" name="Unknown"/>
<member cname="ATK_ROLE_VIEWPORT" name="Viewport"/>
<member cname="ATK_ROLE_WINDOW" name="Window"/>
<member cname="ATK_ROLE_HEADER" name="Header"/>
<member cname="ATK_ROLE_FOOTER" name="Footer"/>
<member cname="ATK_ROLE_PARAGRAPH" name="Paragraph"/>
<member cname="ATK_ROLE_RULER" name="Ruler"/>
<member cname="ATK_ROLE_APPLICATION" name="Application"/>
<member cname="ATK_ROLE_LAST_DEFINED" name="LastDefined"/>
</enum>
<enum name="StateType" cname="AtkStateType" type="enum">
@ -137,6 +151,7 @@
<member cname="ATK_STATE_TRANSIENT" name="Transient"/>
<member cname="ATK_STATE_VERTICAL" name="Vertical"/>
<member cname="ATK_STATE_VISIBLE" name="Visible"/>
<member cname="ATK_STATE_MANAGES_DESCENDANTS" name="ManagesDescendants"/>
<member cname="ATK_STATE_LAST_DEFINED" name="LastDefined"/>
</enum>
<enum name="TextAttribute" cname="AtkTextAttribute" type="enum">
@ -234,6 +249,12 @@
<parameter type="gint" name="i"/>
</parameters>
</method>
<method name="GetLocalizedName" cname="atk_action_get_localized_name">
<return-type type="const-gchar*"/>
<parameters>
<parameter type="gint" name="i"/>
</parameters>
</method>
<method name="GetNActions" cname="atk_action_get_n_actions">
<return-type type="gint"/>
</method>
@ -601,7 +622,7 @@
<method name="GetColumnAtIndex" cname="atk_table_get_column_at_index">
<return-type type="gint"/>
<parameters>
<parameter type="gint" name="index"/>
<parameter type="gint" name="index_"/>
</parameters>
</method>
<method name="GetColumnDescription" cname="atk_table_get_column_description">
@ -639,7 +660,7 @@
<method name="GetRowAtIndex" cname="atk_table_get_row_at_index">
<return-type type="gint"/>
<parameters>
<parameter type="gint" name="index"/>
<parameter type="gint" name="index_"/>
</parameters>
</method>
<method name="GetRowDescription" cname="atk_table_get_row_description">
@ -780,6 +801,12 @@
<parameter type="AtkText*" name="text"/>
</parameters>
</signal>
<signal name="TextAttributesChanged" cname="text_attributes_changed" when="LAST">
<return-type type="void"/>
<parameters>
<parameter type="AtkText*" name="text"/>
</parameters>
</signal>
<method name="AddSelection" cname="atk_text_add_selection">
<return-type type="gboolean"/>
<parameters>
@ -803,7 +830,7 @@
<return-type type="const-gchar*"/>
<parameters>
<parameter type="AtkTextAttribute" name="attr"/>
<parameter type="gint" name="index"/>
<parameter type="gint" name="index_"/>
</parameters>
</method>
<method name="AttributeRegister" cname="atk_text_attribute_register" shared="true">
@ -994,6 +1021,9 @@
<parameter type="gint" name="i"/>
</parameters>
</method>
<method name="IsInline" cname="atk_hyperlink_is_inline">
<return-type type="gboolean"/>
</method>
<method name="IsValid" cname="atk_hyperlink_is_valid">
<return-type type="gboolean"/>
</method>
@ -1080,6 +1110,20 @@
<parameter type="AtkObject*" name="accessible"/>
</parameters>
</signal>
<signal name="ActiveDescendantChanged" cname="active_descendant_changed" when="LAST">
<return-type type="void"/>
<parameters>
<parameter type="AtkObject*" name="accessible"/>
<parameter type="gpointer*" name="child"/>
</parameters>
</signal>
<method name="AddRelationship" cname="atk_object_add_relationship">
<return-type type="gboolean"/>
<parameters>
<parameter type="AtkRelationType" name="relationship"/>
<parameter type="AtkObject*" name="target"/>
</parameters>
</method>
<method name="ConnectPropertyChangeHandler" cname="atk_object_connect_property_change_handler">
<return-type type="guint"/>
<parameters>
@ -1144,6 +1188,13 @@
<parameter type="guint" name="handler_id"/>
</parameters>
</method>
<method name="RemoveRelationship" cname="atk_object_remove_relationship">
<return-type type="gboolean"/>
<parameters>
<parameter type="AtkRelationType" name="relationship"/>
<parameter type="AtkObject*" name="target"/>
</parameters>
</method>
<method name="SetDescription" cname="atk_object_set_description">
<return-type type="void"/>
<parameters>
@ -1440,6 +1491,12 @@
<parameter type="const-gchar*" name="name"/>
</parameters>
</method>
<method name="RoleGetLocalizedName" cname="atk_role_get_localized_name" shared="true">
<return-type type="const-gchar*"/>
<parameters>
<parameter type="AtkRole" name="role"/>
</parameters>
</method>
<method name="RoleGetName" cname="atk_role_get_name" shared="true">
<return-type type="const-gchar*"/>
<parameters>

768
api/gdk-api.xml
View file

File diff suppressed because it is too large Load diff

921
api/gtk-api.xml
View file

File diff suppressed because it is too large Load diff

174
api/pango-api.xml
View file

@ -94,7 +94,22 @@
<enum name="WrapMode" cname="PangoWrapMode" type="enum">
<member cname="PANGO_WRAP_WORD" name="Word"/>
<member cname="PANGO_WRAP_CHAR" name="Char"/>
<member cname="PANGO_WRAP_WORD_CHAR" name="WordChar"/>
</enum>
<callback name="AttrFilterFunc" cname="PangoAttrFilterFunc">
<return-type type="gboolean"/>
<parameters>
<parameter type="PangoAttribute*" name="attribute"/>
<parameter type="gpointer" name="data"/>
</parameters>
</callback>
<callback name="FT2SubstituteFunc" cname="PangoFT2SubstituteFunc">
<return-type type="void"/>
<parameters>
<parameter type="FcPattern*" name="pattern"/>
<parameter type="gpointer" name="data"/>
</parameters>
</callback>
<callback name="FreeGCFunc" cname="PangoFreeGCFunc">
<return-type type="void"/>
<parameters>
@ -110,6 +125,13 @@
<parameter type="GC" name="base_gc"/>
</parameters>
</callback>
<callback name="XftSubstituteFunc" cname="PangoXftSubstituteFunc">
<return-type type="void"/>
<parameters>
<parameter type="FcPattern*" name="pattern"/>
<parameter type="gpointer" name="data"/>
</parameters>
</callback>
<object name="Context" cname="PangoContext" parent="GObject">
<method name="GetBaseDir" cname="pango_context_get_base_dir">
<return-type type="PangoDirection"/>
@ -304,6 +326,36 @@
</parameters>
</method>
</object>
<object name="FT2FontMap" cname="PangoFT2FontMap" parent="PangoFontMap">
<method name="CreateContext" cname="pango_ft2_font_map_create_context">
<return-type type="PangoContext*"/>
</method>
<method name="ForDisplay" cname="pango_ft2_font_map_for_display" shared="true">
<return-type type="PangoFontMap*"/>
</method>
<method name="GetType" cname="pango_ft2_font_map_get_type" shared="true">
<return-type type="GType"/>
</method>
<constructor cname="pango_ft2_font_map_new"/>
<method name="SetDefaultSubstitute" cname="pango_ft2_font_map_set_default_substitute">
<return-type type="void"/>
<parameters>
<parameter type="PangoFT2SubstituteFunc" name="func"/>
<parameter type="gpointer" name="data"/>
<parameter type="GDestroyNotify" name="notify"/>
</parameters>
</method>
<method name="SetResolution" cname="pango_ft2_font_map_set_resolution">
<return-type type="void"/>
<parameters>
<parameter type="double" name="dpi_x"/>
<parameter type="double" name="dpi_y"/>
</parameters>
</method>
<method name="SubstituteChanged" cname="pango_ft2_font_map_substitute_changed">
<return-type type="void"/>
</method>
</object>
<object name="Layout" cname="PangoLayout" parent="GObject">
<method name="ContextChanged" cname="pango_layout_context_changed">
<return-type type="void"/>
@ -323,7 +375,7 @@
<method name="GetCursorPos" cname="pango_layout_get_cursor_pos">
<return-type type="void"/>
<parameters>
<parameter type="int" name="index"/>
<parameter type="int" name="index_"/>
<parameter type="PangoRectangle*" name="strong_pos"/>
<parameter type="PangoRectangle*" name="weak_pos"/>
</parameters>
@ -408,7 +460,7 @@
<method name="IndexToPos" cname="pango_layout_index_to_pos">
<return-type type="void"/>
<parameters>
<parameter type="int" name="index"/>
<parameter type="int" name="index_"/>
<parameter type="PangoRectangle*" name="pos"/>
</parameters>
</method>
@ -516,7 +568,7 @@
<parameters>
<parameter type="int" name="x"/>
<parameter type="int" name="y"/>
<parameter type="int*" name="index"/>
<parameter type="int*" name="index_"/>
<parameter type="int*" name="trailing"/>
</parameters>
</method>
@ -584,6 +636,9 @@
<parameter type="PangoAttrType" name="type"/>
</parameters>
</method>
<method name="GetAttrs" cname="pango_attr_iterator_get_attrs">
<return-type type="GSList*"/>
</method>
<method name="GetFont" cname="pango_attr_iterator_get_font">
<return-type type="void"/>
<parameters>
@ -622,6 +677,13 @@
<method name="Copy" cname="pango_attr_list_copy">
<return-type type="PangoAttrList*"/>
</method>
<method name="Filter" cname="pango_attr_list_filter">
<return-type type="PangoAttrList*"/>
<parameters>
<parameter type="PangoAttrFilterFunc" name="func"/>
<parameter type="gpointer" name="data"/>
</parameters>
</method>
<method name="GetIterator" cname="pango_attr_list_get_iterator">
<return-type type="PangoAttrIterator*"/>
</method>
@ -722,7 +784,7 @@
<method name="Get" cname="pango_coverage_get">
<return-type type="PangoCoverageLevel"/>
<parameters>
<parameter type="int" name="index"/>
<parameter type="int" name="index_"/>
</parameters>
</method>
<method name="Max" cname="pango_coverage_max">
@ -738,7 +800,7 @@
<method name="Set" cname="pango_coverage_set">
<return-type type="void"/>
<parameters>
<parameter type="int" name="index"/>
<parameter type="int" name="index_"/>
<parameter type="PangoCoverageLevel" name="level"/>
</parameters>
</method>
@ -960,6 +1022,24 @@
<field cname="geometry" type="PangoGlyphGeometry"/>
<field cname="attr" type="PangoGlyphVisAttr"/>
</struct>
<struct name="GlyphItem" cname="PangoGlyphItem">
<field cname="item" type="PangoItem*"/>
<field cname="glyphs" type="PangoGlyphString*"/>
<method name="ApplyAttrs" cname="pango_glyph_item_apply_attrs">
<return-type type="GSList*"/>
<parameters>
<parameter type="const-char*" name="text"/>
<parameter type="PangoAttrList*" name="list"/>
</parameters>
</method>
<method name="Split" cname="pango_glyph_item_split">
<return-type type="PangoGlyphItem*"/>
<parameters>
<parameter type="const-char*" name="text"/>
<parameter type="int" name="split_index"/>
</parameters>
</method>
</struct>
<boxed name="GlyphString" cname="PangoGlyphString">
<field cname="num_glyphs" type="gint"/>
<field cname="glyphs" type="PangoGlyphInfo*"/>
@ -1007,7 +1087,7 @@
<parameter type="char*" name="text"/>
<parameter type="int" name="length"/>
<parameter type="PangoAnalysis*" name="analysis"/>
<parameter type="int" name="index"/>
<parameter type="int" name="index_"/>
<parameter type="gboolean" name="trailing"/>
<parameter type="int*" name="x_pos"/>
</parameters>
@ -1026,7 +1106,7 @@
<parameter type="int" name="length"/>
<parameter type="PangoAnalysis*" name="analysis"/>
<parameter type="int" name="x_pos"/>
<parameter type="int*" name="index"/>
<parameter type="int*" name="index_"/>
<parameter type="int*" name="trailing"/>
</parameters>
</method>
@ -1202,8 +1282,8 @@
<method name="GetLineYrange" cname="pango_layout_iter_get_line_yrange">
<return-type type="void"/>
<parameters>
<parameter type="int*" name="y0"/>
<parameter type="int*" name="y1"/>
<parameter type="int*" name="y0_"/>
<parameter type="int*" name="y1_"/>
</parameters>
</method>
<method name="GetRun" cname="pango_layout_iter_get_run">
@ -1260,7 +1340,7 @@
<method name="IndexToX" cname="pango_layout_line_index_to_x">
<return-type type="void"/>
<parameters>
<parameter type="int" name="index"/>
<parameter type="int" name="index_"/>
<parameter type="gboolean" name="trailing"/>
<parameter type="int*" name="x_pos"/>
</parameters>
@ -1275,7 +1355,7 @@
<return-type type="gboolean"/>
<parameters>
<parameter type="int" name="x_pos"/>
<parameter type="int*" name="index"/>
<parameter type="int*" name="index_"/>
<parameter type="int*" name="trailing"/>
</parameters>
</method>
@ -1343,6 +1423,12 @@
<parameter type="guint*" name="script_index"/>
</parameters>
</method>
<method name="Get" cname="pango_ot_info_get" shared="true">
<return-type type="PangoOTInfo*"/>
<parameters>
<parameter type="FT_Face" name="face"/>
</parameters>
</method>
<method name="ListFeatures" cname="pango_ot_info_list_features">
<return-type type="PangoOTTag*"/>
<parameters>
@ -1366,11 +1452,6 @@
<parameter type="PangoOTTableType" name="table_type"/>
</parameters>
</method>
<constructor cname="pango_ot_info_new">
<parameters>
<parameter type="FT_Face" name="face"/>
</parameters>
</constructor>
</struct>
<struct name="OTRuleset" cname="PangoOTRuleset" opaque="true">
<method name="AddFeature" cname="pango_ot_ruleset_add_feature">
@ -1943,22 +2024,17 @@
<parameter type="PangoFont*" name="font"/>
</parameters>
</method>
<method name="FontGetFace" cname="pango_xft_font_get_face" shared="true">
<return-type type="FT_Face"/>
<parameters>
<parameter type="PangoFont*" name="font"/>
</parameters>
</method>
<method name="FontGetFont" cname="pango_xft_font_get_font" shared="true">
<return-type type="XftFont*"/>
<parameters>
<parameter type="PangoFont*" name="font"/>
</parameters>
</method>
<method name="FontGetOtInfo" cname="pango_xft_font_get_ot_info" shared="true">
<return-type type="PangoOTInfo*"/>
<method name="FontGetGlyph" cname="pango_xft_font_get_glyph" shared="true">
<return-type type="guint"/>
<parameters>
<parameter type="PangoFont*" name="font"/>
<parameter type="gunichar" name="wc"/>
</parameters>
</method>
<method name="FontGetType" cname="pango_xft_font_get_type" shared="true">
@ -1971,6 +2047,25 @@
<parameter type="gunichar" name="wc"/>
</parameters>
</method>
<method name="FontHasChar" cname="pango_xft_font_has_char" shared="true">
<return-type type="gboolean"/>
<parameters>
<parameter type="PangoFont*" name="font"/>
<parameter type="gunichar" name="wc"/>
</parameters>
</method>
<method name="FontLockFace" cname="pango_xft_font_lock_face" shared="true">
<return-type type="FT_Face"/>
<parameters>
<parameter type="PangoFont*" name="font"/>
</parameters>
</method>
<method name="FontUnlockFace" cname="pango_xft_font_unlock_face" shared="true">
<return-type type="void"/>
<parameters>
<parameter type="PangoFont*" name="font"/>
</parameters>
</method>
<method name="GetContext" cname="pango_xft_get_context" shared="true">
<return-type type="PangoContext*"/>
<parameters>
@ -1978,6 +2073,13 @@
<parameter type="int" name="screen"/>
</parameters>
</method>
<method name="GetFontMap" cname="pango_xft_get_font_map" shared="true">
<return-type type="PangoFontMap*"/>
<parameters>
<parameter type="Display*" name="display"/>
<parameter type="int" name="screen"/>
</parameters>
</method>
<method name="PictureRender" cname="pango_xft_picture_render" shared="true">
<return-type type="void"/>
<parameters>
@ -2001,6 +2103,30 @@
<parameter type="gint" name="y"/>
</parameters>
</method>
<method name="SetDefaultSubstitute" cname="pango_xft_set_default_substitute" shared="true">
<return-type type="void"/>
<parameters>
<parameter type="Display*" name="display"/>
<parameter type="int" name="screen"/>
<parameter type="PangoXftSubstituteFunc" name="func"/>
<parameter type="gpointer" name="data"/>
<parameter type="GDestroyNotify" name="notify"/>
</parameters>
</method>
<method name="ShutdownDisplay" cname="pango_xft_shutdown_display" shared="true">
<return-type type="void"/>
<parameters>
<parameter type="Display*" name="display"/>
<parameter type="int" name="screen"/>
</parameters>
</method>
<method name="SubstituteChanged" cname="pango_xft_substitute_changed" shared="true">
<return-type type="void"/>
<parameters>
<parameter type="Display*" name="display"/>
<parameter type="int" name="screen"/>
</parameters>
</method>
</class>
</namespace>
</api>

4
configure.in
View file

@ -60,7 +60,7 @@ AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir],
## Versions of dependencies
GNOME_REQUIRED_VERSION=2.0.0
GTK_REQUIRED_VERSION=2.0.0
GTK_REQUIRED_VERSION=2.2.0
PKG_CHECK_MODULES(BASE_DEPENDENCIES, libgnomecanvas-2.0 >= $GNOME_REQUIRED_VERSION libgnomeui-2.0 >= $GNOME_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION, enable_gnome=yes, enable_gnome=no)
if test "x$enable_gnome" = "xno"; then
@ -74,7 +74,7 @@ if test "x$enable_glade" = "xyes"; then
BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS $GLADE_DEPENDENCIES_LIBS"
fi
LIBGDA_REQUIRED_VERSION=0.11
LIBGDA_REQUIRED_VERSION=0.90
PKG_CHECK_MODULES(LIBGDA_DEPENDENCIES, libgda >= $LIBGDA_REQUIRED_VERSION, enable_gda=yes, enable_gda=no)
enable_gnomedb=no
if test "x$enable_gda" = "xyes"; then

2
gdk/Drawable.custom
View file

@ -15,7 +15,7 @@ public System.Drawing.Size Size {
}
}
public void DrawRectangle(Gdk.GC gc, int filled, Gdk.Rectangle area)
public void DrawRectangle(Gdk.GC gc, bool filled, Gdk.Rectangle area)
{
gdk_draw_rectangle(Handle, gc.Handle, filled, area.x, area.y, area.width, area.height);
}

2
generator/Parameters.cs
View file

@ -128,6 +128,8 @@ namespace GtkSharp.Generation {
string[] segs = name.Split('_');
string studly = "";
foreach (string s in segs) {
if (s.Trim () == "")
continue;
studly += (s.Substring(0,1).ToUpper() + s.Substring(1));
}
return studly;

1
generator/SignalHandler.cs
View file

@ -132,6 +132,7 @@ namespace GtkSharp.Generation {
sw.WriteLine("\t\t\targs.Args = new object[" + (parms.Count-1) + "];");
}
for (int idx=1; idx < parms.Count; idx++) {
// sw.WriteLine("\t\t\tConsole.WriteLine (\"" + sname + " arg{0}: \" + arg{0});", idx);
string ctype = (string) parms[idx];
ClassBase wrapper = table.GetClassGen (ctype);
if ((wrapper != null && !(wrapper is StructBase)) || table.IsManuallyWrapped (ctype)) {

2
gtk/GtkSharp.GtkClipboardClearFuncNative.cs
View file

@ -11,7 +11,7 @@ namespace GtkSharp {
{
if (RemoveIfNotAlive ()) return;
object[] _args = new object[2];
_args[0] = (Gtk.Clipboard) GLib.Opaque.GetOpaque(clipboard);
_args[0] = (Gtk.Clipboard) GLib.Object.GetObject(clipboard);
if (_args[0] == null)
_args[0] = new Gtk.Clipboard(clipboard);
_args[1] = Gtk.Clipboard.clipboard_objects[objid];

2
gtk/GtkSharp.GtkClipboardGetFuncNative.cs
View file

@ -11,7 +11,7 @@ namespace GtkSharp {
{
if (RemoveIfNotAlive ()) return;
object[] _args = new object[4];
_args[0] = (Gtk.Clipboard) GLib.Opaque.GetOpaque(clipboard);
_args[0] = (Gtk.Clipboard) GLib.Object.GetObject(clipboard);
if (_args[0] == null)
_args[0] = new Gtk.Clipboard(clipboard);
_args[1] = selection_data;

2
parser/gapi2xml.pl
View file

@ -572,7 +572,7 @@ sub addStaticFuncElems
$classname ne "add" && $classname ne "remove" &&
$classname ne "free" && $classname ne "register" &&
$classname ne "execute" && $classname ne "show" &&
$classname ne "parse") {
$classname ne "parse" && $classname ne "string") {
while ($mnames[$i+$cnt] =~ /$prefix/) { $cnt++; }
}
if ($cnt == 1) {

4
sample/Scribble.cs
View file

@ -76,7 +76,7 @@ namespace GtkSamples {
allocation.height,
-1);
Console.WriteLine ("Darea.Style={0}", darea.Style);
pixmap.DrawRectangle (darea.Style.WhiteGC, 1, 0, 0,
pixmap.DrawRectangle (darea.Style.WhiteGC, true, 0, 0,
allocation.width, allocation.height);
SignalArgs sa = (SignalArgs) args;
@ -91,7 +91,7 @@ namespace GtkSamples {
update_rect.width = 10;
update_rect.height = 10;
pixmap.DrawRectangle (darea.Style.BlackGC, 1,
pixmap.DrawRectangle (darea.Style.BlackGC, true,
update_rect.x, update_rect.y,
update_rect.width, update_rect.height);
darea.QueueDrawArea (update_rect.x, update_rect.y,

16
sources/Gdk.metadata
View file

@ -61,7 +61,7 @@
</class>
<data>
<attribute target="param">
<filter level="type">GdkWindow*</filter>
<filter level="type">GdkDrawable*</filter>
<name>null_ok</name>
<value>1</value>
</attribute>
@ -221,6 +221,20 @@
</attribute>
</data>
</rule>
<rule>
<class name="GdkScreen">
<method>Height</method>
<method>HeightMm</method>
<method>Width</method>
<method>WidthMm</method>
</class>
<data>
<attribute target="method">
<name>hidden</name>
<value>1</value>
</attribute>
</data>
</rule>
<rule>
<class name="GdkPixbufLoader">

66
sources/Gtk.metadata
View file

@ -493,6 +493,16 @@
</attribute>
</data>
</rule>
<rule>
<class name="GtkProgressBar"/>
<data>
<attribute target="class">
<name>parent</name>
<value>GtkWidget</value>
</attribute>
</data>
</rule>
<!-- renames -->
<rule>
@ -726,6 +736,17 @@
</attribute>
</data>
</rule>
<rule>
<class name="GtkWidget">
<method>IsFocus</method>
</class>
<data>
<attribute target="method">
<name>name</name>
<value>GetIsFocus</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkWidget">
<method>Event</method>
@ -1605,6 +1626,27 @@
</data>
</rule>
<!-- new_flags -->
<rule>
<class name="GtkInvisible">
<method>GetScreen</method>
<method>SetScreen</method>
</class>
<class name="GtkMenu">
<method>SetScreen</method>
</class>
<class name="GtkWindow">
<method>GetScreen</method>
<method>SetScreen</method>
</class>
<data>
<attribute target="method">
<name>new_flag</name>
<value>1</value>
</attribute>
</data>
</rule>
<!-- hides -->
<rule>
<class name="GtkArrow">
@ -1649,6 +1691,8 @@
<class name="GtkBindingSet"/>
<class name="GtkPathPriorityType"/>
<class name="GtkPathType"/>
<class name="GtkProgress"/>
<class name="GtkProgressClass"/>
<data>
<attribute target="class">
<name>hidden</name>
@ -1674,6 +1718,28 @@
</attribute>
</data>
</rule>
<rule>
<class name="GtkColorSelection">
<method>SetChangePaletteWithScreenHook</method>
</class>
<data>
<attribute target="method">
<name>hidden</name>
<value>1</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkRadioButton">
<property>Group</property>
</class>
<data>
<attribute target="property">
<name>hidden</name>
<value>1</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkWidget">
<method>Destroyed</method>

6
sources/README
View file

@ -56,9 +56,9 @@ WHAT'S REQUIRED
list of libraries that Gtk# supports is:
glib-2.0.3
pango-1.0.3
atk-1.0.2
gtk+-2.0.5
pango-1.2.3
atk-1.2.4
gtk+-2.2.2
* you need gdkpixbuf*.[ch] from gdk/ symlinked into gdk-pixbuf/
libgnome-2.0.1
libgnomecanvas-2.0.1

10
sources/gtk-sharp.sources
View file

@ -1,8 +1,8 @@
atk-1.0.2/atk Atk libatk-1.0-0.dll
pango-1.0.3/pango Pango libpango-1.0-0.dll
gtk+-2.0.5/gdk Gdk libgdk-win32-2.0-0.dll
gtk+-2.0.5/gdk-pixbuf Gdk libgdk_pixbuf-2.0-0.dll
gtk+-2.0.5/gtk Gtk libgtk-win32-2.0-0.dll
atk-1.2.4/atk Atk libatk-1.0-0.dll
pango-1.2.3/pango Pango libpango-1.0-0.dll
gtk+-2.2.2/gdk Gdk libgdk-win32-2.0-0.dll
gtk+-2.2.2/gdk-pixbuf Gdk libgdk_pixbuf-2.0-0.dll
gtk+-2.2.2/gtk Gtk libgtk-win32-2.0-0.dll
libgnome-2.0.1/libgnome Gnome gnome-2
libgnomecanvas-2.0.1/libgnomecanvas Gnome gnomecanvas-2
libgnomeui-2.0.1/libgnomeui Gnome gnomeui-2

12
sources/makefile
View file

@ -1,7 +1,7 @@
DOWNLOADS = \
http://ftp.gnome.org/pub/GNOME/desktop/2.0/2.0.0/sources/atk-1.0.2.tar.gz \
http://ftp.gnome.org/pub/GNOME/desktop/2.0/2.0.0/sources/pango-1.0.3.tar.gz \
http://ftp.gnome.org/pub/GNOME/desktop/2.0/2.0.0/sources/gtk+-2.0.5.tar.gz \
http://ftp.gnome.org/pub/GNOME/sources/pango/1.2/pango-1.2.3.tar.gz \
http://ftp.gnome.org/pub/GNOME/sources/atk/1.2/atk-1.2.4.tar.gz \
http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.2/gtk+-2.2.2.tar.gz \
http://ftp.gnome.org/pub/GNOME/desktop/2.0/2.0.0/sources/libgnome-2.0.1.tar.gz \
http://ftp.gnome.org/pub/GNOME/desktop/2.0/2.0.0/sources/libgnomecanvas-2.0.1.tar.gz \
http://ftp.gnome.org/pub/GNOME/desktop/2.0/2.0.0/sources/libgnomeui-2.0.1.tar.gz \
@ -27,9 +27,9 @@ get-source-code:
cvs -z3 -d:pserver:anonymous@anoncvs.gnome.org:/cvs/gnome co gtkhtml/src/gtkhtml-enums.h
cvs -z3 -d:pserver:anonymous@anoncvs.gnome.org:/cvs/gnome co gtkhtml/src/gtkhtml-stream.c
cvs -z3 -d:pserver:anonymous@anoncvs.gnome.org:/cvs/gnome co gtkhtml/src/gtkhtml-stream.h
ln -f -s ../gdk/gdkpixbuf-drawable.c gtk+-2.0.5/gdk-pixbuf/gdkpixbuf-drawable.c
ln -f -s ../gdk/gdkpixbuf.h gtk+-2.0.5/gdk-pixbuf/gdkpixbuf.h
ln -f -s ../gdk/gdkpixbuf-render.c gtk+-2.0.5/gdk-pixbuf/gdkpixbuf-render.c
ln -f -s ../gdk/gdkpixbuf-drawable.c gtk+-2.2.2/gdk-pixbuf/gdkpixbuf-drawable.c
ln -f -s ../gdk/gdkpixbuf.h gtk+-2.2.2/gdk-pixbuf/gdkpixbuf.h
ln -f -s ../gdk/gdkpixbuf-render.c gtk+-2.2.2/gdk-pixbuf/gdkpixbuf-render.c
distclean:
for i in `ls`; do \