ryujinx/GtkSharp
1
0
Fork 0
mirror of https://github.com/Ryujinx/GtkSharp.git synced 2025-01-22 20:31:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

2002-11-21 Mike Kestner <mkestner@speakeasy.net>

Browse source 
* api/*.xml : a few new attrs
	* generator/Parameters.cs : remove redundant ref keywords
	* gtk/ListStore.custom: overload SetColumnTypes
	* gtk/TreeStore.custom: overload SetColumnTypes
	* parser/GAPI/Metadata.pm : allow callback nodes at class level
	* sources/Gtk.metadata : hide ClipboardClearFunc and GetFunc,
	tag types param of SetColumnTypes as array, uncomment needs_ref
	tags on Widget methods to match the current api.xml file

svn path=/trunk/gtk-sharp/; revision=9148
This commit is contained in:
Mike Kestner 2002-11-22 03:30:18 +00:00
parent 79c93e89fd
commit 3a108845d7
8 changed files with 170 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,14 @@
2002-11-21 Mike Kestner <mkestner@speakeasy.net>
* api/*.xml : a few new attrs
* generator/Parameters.cs : remove redundant ref keywords
* gtk/ListStore.custom: overload SetColumnTypes
* gtk/TreeStore.custom: overload SetColumnTypes
* parser/GAPI/Metadata.pm : allow callback nodes at class level
* sources/Gtk.metadata : hide ClipboardClearFunc and GetFunc,
tag types param of SetColumnTypes as array, uncomment needs_ref
tags on Widget methods to match the current api.xml file
2002-11-19 Mike Kestner <mkestner@speakeasy.net> 2002-11-19 Mike Kestner <mkestner@speakeasy.net>
* gtk/Dialog.custom : bind another ctor * gtk/Dialog.custom : bind another ctor
@ -14,7 +25,6 @@
* pango/Scale.cs: added file containing constants * pango/Scale.cs: added file containing constants
for text widgets needing Pango Scale Attribute for text widgets needing Pango Scale Attribute
2002-11-13 Vladimir Vukicevic <vladimir@pobox.com>
2002-11-13 Vladimir Vukicevic <vladimir@pobox.com> 2002-11-13 Vladimir Vukicevic <vladimir@pobox.com>
* gtk/CanvasItem.custom: use base() to set Raw in constructor, so * gtk/CanvasItem.custom: use base() to set Raw in constructor, so

31
api/gdk-api.xml
View file

@ -1852,7 +1852,7 @@
<return-type type="gint"/> <return-type type="gint"/>
<parameters> <parameters>
<parameter type="const-gchar*" name="spec"/> <parameter type="const-gchar*" name="spec"/>
<parameter type="GdkColor*" name="color"/> <parameter type="GdkColor*" name="color" pass_as="ref"/>
</parameters> </parameters>
</method> </method>
</boxed> </boxed>
@ -2411,6 +2411,15 @@
</parameters> </parameters>
</callback> </callback>
<object name="Pixbuf" cname="GdkPixbuf" parent="GObject"> <object name="Pixbuf" cname="GdkPixbuf" parent="GObject">
<method name="AddAlpha" cname="gdk_pixbuf_add_alpha" hidden="1">
<return-type type="GdkPixbuf*"/>
<parameters>
<parameter type="gboolean" name="substitute_color"/>
<parameter type="guchar" name="r"/>
<parameter type="guchar" name="g"/>
<parameter type="guchar" name="b"/>
</parameters>
</method>
<method name="AlphaModeGetType" cname="gdk_pixbuf_alpha_mode_get_type" shared="true"> <method name="AlphaModeGetType" cname="gdk_pixbuf_alpha_mode_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
@ -2451,6 +2460,18 @@
<parameter type="guint32" name="color2"/> <parameter type="guint32" name="color2"/>
</parameters> </parameters>
</method> </method>
<method name="CompositeColorSimple" cname="gdk_pixbuf_composite_color_simple" hidden="1">
<return-type type="GdkPixbuf*"/>
<parameters>
<parameter type="int" name="dest_width"/>
<parameter type="int" name="dest_height"/>
<parameter type="GdkInterpType" name="interp_type"/>
<parameter type="int" name="overall_alpha"/>
<parameter type="int" name="check_size"/>
<parameter type="guint32" name="color1"/>
<parameter type="guint32" name="color2"/>
</parameters>
</method>
<method name="Copy" cname="gdk_pixbuf_copy"> <method name="Copy" cname="gdk_pixbuf_copy">
<return-type type="GdkPixbuf*"/> <return-type type="GdkPixbuf*"/>
</method> </method>
@ -2700,6 +2721,14 @@
<parameter type="GdkInterpType" name="interp_type"/> <parameter type="GdkInterpType" name="interp_type"/>
</parameters> </parameters>
</method> </method>
<method name="ScaleSimple" cname="gdk_pixbuf_scale_simple" hidden="1">
<return-type type="GdkPixbuf*"/>
<parameters>
<parameter type="int" name="dest_width"/>
<parameter type="int" name="dest_height"/>
<parameter type="GdkInterpType" name="interp_type"/>
</parameters>
</method>
</object> </object>
<object name="PixbufAnimation" cname="GdkPixbufAnimation" parent="GObject"> <object name="PixbufAnimation" cname="GdkPixbufAnimation" parent="GObject">
<method name="GetHeight" cname="gdk_pixbuf_animation_get_height"> <method name="GetHeight" cname="gdk_pixbuf_animation_get_height">

80
api/gtk-api.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0"?>
<api> <api>
<namespace name="Gtk" library="gtk-x11-2.0"> <namespace name="Gtk" library="gtk-x11-2.0">
<enum name="AccelFlags" cname="GtkAccelFlags" type="flags"> <enum name="AccelFlags" cname="GtkAccelFlags" type="flags">
@ -506,6 +506,22 @@
<parameter type="GtkArg*" name="args"/> <parameter type="GtkArg*" name="args"/>
</parameters> </parameters>
</callback> </callback>
<callback name="ClipboardClearFunc" cname="GtkClipboardClearFunc" hidden="1">
<return-type type="void"/>
<parameters>
<parameter type="GtkClipboard*" name="clipboard"/>
<parameter type="gpointer" name="user_data_or_owner"/>
</parameters>
</callback>
<callback name="ClipboardGetFunc" cname="GtkClipboardGetFunc" hidden="1">
<return-type type="void"/>
<parameters>
<parameter type="GtkClipboard*" name="clipboard"/>
<parameter type="GtkSelectionData*" name="selection_data"/>
<parameter type="guint" name="info"/>
<parameter type="gpointer" name="user_data_or_owner"/>
</parameters>
</callback>
<callback name="ClipboardReceivedFunc" cname="GtkClipboardReceivedFunc"> <callback name="ClipboardReceivedFunc" cname="GtkClipboardReceivedFunc">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -609,10 +625,6 @@
</callback> </callback>
<callback name="SignalFunc" cname="GtkSignalFunc"> <callback name="SignalFunc" cname="GtkSignalFunc">
<return-type type="void"/> <return-type type="void"/>
<parameters>
<parameter type="GtkObject*" name="object"/>
<parameter type="gpointer" name="data"/>
</parameters>
</callback> </callback>
<callback name="TextCharPredicate" cname="GtkTextCharPredicate"> <callback name="TextCharPredicate" cname="GtkTextCharPredicate">
<return-type type="gboolean"/> <return-type type="gboolean"/>
@ -4269,7 +4281,7 @@
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="gint" name="n_columns"/> <parameter type="gint" name="n_columns"/>
<parameter type="GType*" name="types"/> <parameter type="GType*" name="types" array="true"/>
</parameters> </parameters>
</method> </method>
<method name="SetValist" cname="gtk_list_store_set_valist"> <method name="SetValist" cname="gtk_list_store_set_valist">
@ -7940,7 +7952,7 @@
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="gint" name="n_columns"/> <parameter type="gint" name="n_columns"/>
<parameter type="GType*" name="types"/> <parameter type="GType*" name="types" array="true"/>
</parameters> </parameters>
</method> </method>
<method name="SetValist" cname="gtk_tree_store_set_valist"> <method name="SetValist" cname="gtk_tree_store_set_valist">
@ -10471,6 +10483,26 @@
<parameter type="gint" name="len"/> <parameter type="gint" name="len"/>
</parameters> </parameters>
</method> </method>
<method name="SetWithData" cname="gtk_clipboard_set_with_data">
<return-type type="gboolean"/>
<parameters>
<parameter type="const-GtkTargetEntry*" name="targets"/>
<parameter type="guint" name="n_targets"/>
<parameter type="GtkClipboardGetFunc" name="get_func"/>
<parameter type="GtkClipboardClearFunc" name="clear_func"/>
<parameter type="gpointer" name="user_data"/>
</parameters>
</method>
<method name="SetWithOwner" cname="gtk_clipboard_set_with_owner">
<return-type type="gboolean"/>
<parameters>
<parameter type="const-GtkTargetEntry*" name="targets"/>
<parameter type="guint" name="n_targets"/>
<parameter type="GtkClipboardGetFunc" name="get_func"/>
<parameter type="GtkClipboardClearFunc" name="clear_func"/>
<parameter type="GObject*" name="owner"/>
</parameters>
</method>
<method name="WaitForContents" cname="gtk_clipboard_wait_for_contents"> <method name="WaitForContents" cname="gtk_clipboard_wait_for_contents">
<return-type type="GtkSelectionData*"/> <return-type type="GtkSelectionData*"/>
<parameters> <parameters>
@ -10773,9 +10805,28 @@
<parameter type="gint*" name="n_atoms"/> <parameter type="gint*" name="n_atoms"/>
</parameters> </parameters>
</method> </method>
<method name="GetText" cname="gtk_selection_data_get_text" hidden="1">
<return-type type="guchar*"/>
</method>
<method name="GetType" cname="gtk_selection_data_get_type" shared="true"> <method name="GetType" cname="gtk_selection_data_get_type" shared="true">
<return-type type="GType"/> <return-type type="GType"/>
</method> </method>
<method name="Set" cname="gtk_selection_data_set" hidden="1">
<return-type type="void"/>
<parameters>
<parameter type="GdkAtom" name="type"/>
<parameter type="gint" name="format"/>
<parameter type="const-guchar*" name="data"/>
<parameter type="gint" name="length"/>
</parameters>
</method>
<method name="SetText" cname="gtk_selection_data_set_text" hidden="1">
<return-type type="gboolean"/>
<parameters>
<parameter type="const-gchar*" name="str"/>
<parameter type="gint" name="len"/>
</parameters>
</method>
<method name="TargetsIncludeText" cname="gtk_selection_data_targets_include_text"> <method name="TargetsIncludeText" cname="gtk_selection_data_targets_include_text">
<return-type type="gboolean"/> <return-type type="gboolean"/>
</method> </method>
@ -11757,6 +11808,10 @@
<member cname="GTK_HTML_COMMAND_TEXT_COLOR_APPLY" name="TextColorApply"/> <member cname="GTK_HTML_COMMAND_TEXT_COLOR_APPLY" name="TextColorApply"/>
<member cname="GTK_HTML_COMMAND_SAVE_DATA_ON" name="SaveDataOn"/> <member cname="GTK_HTML_COMMAND_SAVE_DATA_ON" name="SaveDataOn"/>
<member cname="GTK_HTML_COMMAND_SAVE_DATA_OFF" name="SaveDataOff"/> <member cname="GTK_HTML_COMMAND_SAVE_DATA_OFF" name="SaveDataOff"/>
<member cname="GTK_HTML_COMMAND_SAVED" name="Saved"/>
<member cname="GTK_HTML_COMMAND_IS_SAVED" name="IsSaved"/>
<member cname="GTK_HTML_COMMAND_SCROLL_BOD" name="ScrollBod"/>
<member cname="GTK_HTML_COMMAND_SCROLL_EOD" name="ScrollEod"/>
</enum> </enum>
<enum name="HTMLCursorSkipType" cname="GtkHTMLCursorSkipType" type="enum"> <enum name="HTMLCursorSkipType" cname="GtkHTMLCursorSkipType" type="enum">
<member cname="GTK_HTML_CURSOR_SKIP_ONE" name="One"/> <member cname="GTK_HTML_CURSOR_SKIP_ONE" name="One"/>
@ -11793,6 +11848,17 @@
<member cname="GTK_HTML_FONT_STYLE_SUBSCRIPT" name="Subscript" value="1 &lt;&lt; 8"/> <member cname="GTK_HTML_FONT_STYLE_SUBSCRIPT" name="Subscript" value="1 &lt;&lt; 8"/>
<member cname="GTK_HTML_FONT_STYLE_SUPERSCRIPT" name="Superscript" value="1 &lt;&lt; 9"/> <member cname="GTK_HTML_FONT_STYLE_SUPERSCRIPT" name="Superscript" value="1 &lt;&lt; 9"/>
</enum> </enum>
<enum name="HTMLFontStyleShift" cname="GtkHTMLFontStyleShift" type="enum">
<member cname="GTK_HTML_FONT_STYLE_SHIFT_FIRST" name="First" value="3"/>
<member cname="GTK_HTML_FONT_STYLE_SHIFT_BOLD" name="Bold"/>
<member cname="GTK_HTML_FONT_STYLE_SHIFT_ITALIC" name="Italic"/>
<member cname="GTK_HTML_FONT_STYLE_SHIFT_UNDERLINE" name="Underline"/>
<member cname="GTK_HTML_FONT_STYLE_SHIFT_STRIKEOUT" name="Strikeout"/>
<member cname="GTK_HTML_FONT_STYLE_SHIFT_FIXED" name="Fixed"/>
<member cname="GTK_HTML_FONT_STYLE_SHIFT_SUBSCRIPT" name="Subscript"/>
<member cname="GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT" name="Superscript"/>
<member cname="GTK_HTML_FONT_STYLE_SHIFT_LAST" name="Last"/>
</enum>
<enum name="HTMLParagraphAlignment" cname="GtkHTMLParagraphAlignment" type="enum"> <enum name="HTMLParagraphAlignment" cname="GtkHTMLParagraphAlignment" type="enum">
<member cname="GTK_HTML_PARAGRAPH_ALIGNMENT_LEFT" name="Left"/> <member cname="GTK_HTML_PARAGRAPH_ALIGNMENT_LEFT" name="Left"/>
<member cname="GTK_HTML_PARAGRAPH_ALIGNMENT_RIGHT" name="Right"/> <member cname="GTK_HTML_PARAGRAPH_ALIGNMENT_RIGHT" name="Right"/>

2
generator/Parameters.cs
View file

@ -295,6 +295,8 @@ namespace GtkSharp.Generation {
// FIXME: lame // FIXME: lame
call_string = call_string.Replace ("out ref", "out"); call_string = call_string.Replace ("out ref", "out");
import_sig = import_sig.Replace ("out ref", "out"); import_sig = import_sig.Replace ("out ref", "out");
call_string = call_string.Replace ("ref ref", "out");
import_sig = import_sig.Replace ("ref ref", "out");
// FIXME: this is also lame, I need to fix the need_sep algo // FIXME: this is also lame, I need to fix the need_sep algo
if (signature.EndsWith (", ")) if (signature.EndsWith (", "))

5
gtk/ListStore.custom
View file

@ -29,3 +29,8 @@
bool ret = raw_ret; bool ret = raw_ret;
return ret; return ret;
} }
public void SetColumnTypes (params int[] types)
{
SetColumnTypes (types.Length, types);
}

5
gtk/TreeStore.custom
View file

@ -109,3 +109,8 @@
bool ret = raw_ret; bool ret = raw_ret;
return ret; return ret;
} }
public void SetColumnTypes (params int[] types)
{
SetColumnTypes (types.Length, types);
}

2
parser/GAPI/Metadata.pm
View file

@ -179,7 +179,7 @@ sub fixupNamespace {
foreach $rule (@{$self->{rules}}) { foreach $rule (@{$self->{rules}}) {
my ($classes_ref, $data_list_ref) = @$rule; my ($classes_ref, $data_list_ref) = @$rule;
for ($node = $ns_node->firstChild; $node; $node = $node->nextSibling ()) { for ($node = $ns_node->firstChild; $node; $node = $node->nextSibling ()) {
next if not ($node->nodeName eq "object" or $node->nodeName eq "interface" or $node->nodeName eq "struct" or $node->nodeName eq "boxed"); next if not ($node->nodeName eq "object" or $node->nodeName eq "interface" or $node->nodeName eq "struct" or $node->nodeName eq "boxed" or $node->nodeName eq "callback");
my $class, $methods_ref, $attr; my $class, $methods_ref, $attr;
foreach $attr ($node->attributes) { foreach $attr ($node->attributes) {
if ($attr->name eq "cname") { if ($attr->name eq "cname") {

46
sources/Gtk.metadata
View file

@ -59,6 +59,30 @@
</attribute> </attribute>
</data> </data>
</rule> </rule>
<rule>
<class name="GtkListStore">
<method>SetColumnTypes</method>
</class>
<data>
<attribute target="param">
<filter level="name">types</filter>
<name>array</name>
<value>true</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkTreeStore">
<method>SetColumnTypes</method>
</class>
<data>
<attribute target="param">
<filter level="name">types</filter>
<name>array</name>
<value>true</value>
</attribute>
</data>
</rule>
<rule> <rule>
<class name="GtkTreeModelSort"> <class name="GtkTreeModelSort">
<method>ConvertChildIterToIter</method> <method>ConvertChildIterToIter</method>
@ -1250,6 +1274,24 @@
</rule> </rule>
<!-- hides --> <!-- hides -->
<rule>
<class name="GtkClipboardClearFunc"/>
<data>
<attribute target="class">
<name>hidden</name>
<value>1</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkClipboardGetFunc"/>
<data>
<attribute target="class">
<name>hidden</name>
<value>1</value>
</attribute>
</data>
</rule>
<rule> <rule>
<class name="GtkWidget"> <class name="GtkWidget">
<method>Destroyed</method> <method>Destroyed</method>
@ -1867,7 +1909,7 @@
<!-- reference rules --> <!-- reference rules -->
<rule> <rule>
<!-- <class name="GtkWidget"> <class name="GtkWidget">
<method>GetStyle</method> <method>GetStyle</method>
<method>GetModifierStyle</method> <method>GetModifierStyle</method>
<method>GetDefaultStyle</method> <method>GetDefaultStyle</method>
@ -1883,8 +1925,6 @@
<value>1</value> <value>1</value>
</attribute> </attribute>
</data> </data>
-->
</rule> </rule>
</metadata> </metadata>