* en/Gtk/ItemFactory.xml: Rename GetItemByAction and

GetWidgetByAction to GetItem and GetWidget, to reflect metadata
changes.

* en/Gtk/TextBuffer.xml: Remove all references to *ByName methods,
as they are now all overrides.

* en/Gtk/HTML.xml: Update to use the new Begin overloads, since
bug #46427 is fixed.

* sources/Gtk.metadata
(GtkIconSet): hide the GetSizes method.
(GtkTextBuffer): new overrides
        MoveMarkByName    -> MoveMark
        DeleteMarkByName  -> DeleteMark
        ApplyTagByName    -> ApplyTag
        RemoveTagByName   -> RemoveTag
(GtkItemFactory): new overrides
        GetItemByAction   -> GetItem
        GetWidgetByAction -> GetWidget

* sources/gtkhtml-font-style-enum.patch: A patch to use real values
in gtkhtml-enums.h so that the parser won't choke on the complex enum
declarations.

svn path=/trunk/gtk-sharp/; revision=16282
This commit is contained in:
Duncan Mak 2003-07-16 02:07:51 +00:00
parent 7880ee2044
commit 870b00b76e
8 changed files with 181 additions and 35 deletions

View file

@ -1,11 +1,27 @@
2003-07-15 Duncan Mak <duncan@ximian.com>
* sources/Gtk.metadata
(GtkIconSet): hide the GetSizes method.
(GtkTextBuffer): new overrides
MoveMarkByName -> MoveMark
DeleteMarkByName -> DeleteMark
ApplyTagByName -> ApplyTag
RemoveTagByName -> RemoveTag
(GtkItemFactory): new overrides
GetItemByAction -> GetItem
GetWidgetByAction -> GetWidget
These two changes fixes bug #46388.
(GtkHTML): overrides for Begin, mark BeginContent and BeginFull as
overrides of Begin. This fixes bug #46427.
* sources/gtkhtml-font-style-enum.patch: A patch to use real values
in gtkhtml-enums.h so that the parser won't choke on the complex enum
declarations.
* sources/makefile: Apply the above patch after checking out the
source code for GtkHTML
source code for GtkHTML.
2003-07-14 Mike Kestner <mkestner@speakeasy.net>

View file

@ -3966,7 +3966,7 @@
<parameter type="const-gchar*" name="path"/>
</parameters>
</method>
<method name="GetItemByAction" cname="gtk_item_factory_get_item_by_action">
<method name="GetItem" cname="gtk_item_factory_get_item_by_action">
<return-type type="GtkWidget*"/>
<parameters>
<parameter type="guint" name="action"/>
@ -3981,7 +3981,7 @@
<parameter type="const-gchar*" name="path"/>
</parameters>
</method>
<method name="GetWidgetByAction" cname="gtk_item_factory_get_widget_by_action">
<method name="GetWidget" cname="gtk_item_factory_get_widget_by_action">
<return-type type="GtkWidget*"/>
<parameters>
<parameter type="guint" name="action"/>
@ -6528,7 +6528,7 @@
<parameter type="const-GtkTextIter*" name="end"/>
</parameters>
</method>
<method name="ApplyTagByName" cname="gtk_text_buffer_apply_tag_by_name">
<method name="ApplyTag" cname="gtk_text_buffer_apply_tag_by_name">
<return-type type="void"/>
<parameters>
<parameter type="const-gchar*" name="name"/>
@ -6595,7 +6595,7 @@
<parameter type="GtkTextMark*" name="mark"/>
</parameters>
</method>
<method name="DeleteMarkByName" cname="gtk_text_buffer_delete_mark_by_name">
<method name="DeleteMark" cname="gtk_text_buffer_delete_mark_by_name">
<return-type type="void"/>
<parameters>
<parameter type="const-gchar*" name="name"/>
@ -6814,7 +6814,7 @@
<parameter type="const-GtkTextIter*" name="where"/>
</parameters>
</method>
<method name="MoveMarkByName" cname="gtk_text_buffer_move_mark_by_name">
<method name="MoveMark" cname="gtk_text_buffer_move_mark_by_name">
<return-type type="void"/>
<parameters>
<parameter type="const-gchar*" name="name"/>
@ -6861,7 +6861,7 @@
<parameter type="const-GtkTextIter*" name="end"/>
</parameters>
</method>
<method name="RemoveTagByName" cname="gtk_text_buffer_remove_tag_by_name">
<method name="RemoveTag" cname="gtk_text_buffer_remove_tag_by_name">
<return-type type="void"/>
<parameters>
<parameter type="const-gchar*" name="name"/>
@ -10800,7 +10800,7 @@
<method name="Copy" cname="gtk_icon_set_copy">
<return-type type="GtkIconSet*"/>
</method>
<method name="GetSizes" cname="gtk_icon_set_get_sizes">
<method name="GetSizes" cname="gtk_icon_set_get_sizes" hidden="1">
<return-type type="void"/>
<parameters>
<parameter type="GtkIconSize**" name="sizes"/>
@ -13747,13 +13747,13 @@
<method name="Begin" cname="gtk_html_begin">
<return-type type="GtkHTMLStream*"/>
</method>
<method name="BeginContent" cname="gtk_html_begin_content">
<method name="Begin" cname="gtk_html_begin_content">
<return-type type="GtkHTMLStream*"/>
<parameters>
<parameter type="gchar*" name="content_type"/>
</parameters>
</method>
<method name="BeginFull" cname="gtk_html_begin_full">
<method name="Begin" cname="gtk_html_begin_full">
<return-type type="GtkHTMLStream*"/>
<parameters>
<parameter type="char*" name="target_frame"/>

View file

@ -1,3 +1,15 @@
2003-07-15 Duncan Mak <duncan@ximian.com>
* en/Gtk/ItemFactory.xml: Rename GetItemByAction and
GetWidgetByAction to GetItem and GetWidget, to reflect metadata
changes.
* en/Gtk/TextBuffer.xml: Remove all references to *ByName methods,
as they are now all overrides.
* en/Gtk/HTML.xml: Update to use the new Begin overloads, since
bug #46427 is fixed.
2003-07-14 Duncan Mak <duncan@ximian.com>
* en/Gtk/TextView.xml: all documented except for events.

View file

@ -467,8 +467,8 @@ class X {
<remarks>Selects all of the contents of the HTML widget.</remarks>
</Docs>
</Member>
<Member MemberName="BeginFull">
<MemberSignature Language="C#" Value="public Gtk.HTMLStream BeginFull (string target_frame, string content_type, Gtk.HTMLBeginFlags flags);" />
<Member MemberName="Begin">
<MemberSignature Language="C#" Value="public Gtk.HTMLStream Begin (string target_frame, string content_type, Gtk.HTMLBeginFlags flags);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>Gtk.HTMLStream</ReturnType>
@ -702,8 +702,8 @@ class X {
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="BeginContent">
<MemberSignature Language="C#" Value="public Gtk.HTMLStream BeginContent (string content_type);" />
<Member MemberName="Begin">
<MemberSignature Language="C#" Value="public Gtk.HTMLStream Begin (string content_type);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>Gtk.HTMLStream</ReturnType>
@ -738,7 +738,7 @@ class X {
w.Add (html);
w.ShowAll ();
HTMLStream s = html.BeginContent ("text/html; charset=utf-8");
HTMLStream s = html.Begin ("text/html; charset=utf-8");
string line;
while ((line = Console.ReadLine ()) != null)

View file

@ -136,8 +136,8 @@
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="GetItemByAction">
<MemberSignature Language="C#" Value="public Gtk.Widget GetItemByAction (uint action);" />
<Member MemberName="GetItem">
<MemberSignature Language="C#" Value="public Gtk.Widget GetItem (uint action);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>Gtk.Widget</ReturnType>
@ -226,8 +226,8 @@
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="GetWidgetByAction">
<MemberSignature Language="C#" Value="public Gtk.Widget GetWidgetByAction (uint action);" />
<Member MemberName="GetWidget">
<MemberSignature Language="C#" Value="public Gtk.Widget GetWidget (uint action);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>Gtk.Widget</ReturnType>

View file

@ -44,8 +44,8 @@
</remarks>
</Docs>
</Member>
<Member MemberName="DeleteMarkByName">
<MemberSignature Language="C#" Value="public void DeleteMarkByName (string name);" />
<Member MemberName="DeleteMark">
<MemberSignature Language="C#" Value="public void DeleteMark (string name);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
@ -454,8 +454,8 @@
</remarks>
</Docs>
</Member>
<Member MemberName="RemoveTagByName">
<MemberSignature Language="C#" Value="public void RemoveTagByName (string name, Gtk.TextIter start, Gtk.TextIter end);" />
<Member MemberName="RemoveTag">
<MemberSignature Language="C#" Value="public void RemoveTag (string name, Gtk.TextIter start, Gtk.TextIter end);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
@ -710,8 +710,8 @@
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="MoveMarkByName">
<MemberSignature Language="C#" Value="public void MoveMarkByName (string name, Gtk.TextIter where);" />
<Member MemberName="MoveMark">
<MemberSignature Language="C#" Value="public void MoveMark (string name, Gtk.TextIter where);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
@ -822,8 +822,8 @@
</remarks>
</Docs>
</Member>
<Member MemberName="ApplyTagByName">
<MemberSignature Language="C#" Value="public void ApplyTagByName (string name, Gtk.TextIter start, Gtk.TextIter end);" />
<Member MemberName="ApplyTag">
<MemberSignature Language="C#" Value="public void ApplyTag (string name, Gtk.TextIter start, Gtk.TextIter end);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>

View file

@ -1659,6 +1659,17 @@
</attribute>
</data>
</rule>
<rule>
<class name="GtkIconSet">
<method>GetSizes</method>
</class>
<data>
<attribute target="method">
<name>hidden</name>
<value>1</value>
</attribute>
</data>
</rule>
<!-- Supress private API bits -->
<rule>
<class name="GtkBorder"/>
@ -1858,7 +1869,94 @@
</attribute>
</data>
</rule>
<rule>
<class name="GtkTextBuffer">
<method>MoveMarkByName</method>
</class>
<data>
<attribute target="method">
<name>name</name>
<value>MoveMark</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkTextBuffer">
<method>DeleteMarkByName</method>
</class>
<data>
<attribute target="method">
<name>name</name>
<value>DeleteMark</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkTextBuffer">
<method>ApplyTagByName</method>
</class>
<data>
<attribute target="method">
<name>name</name>
<value>ApplyTag</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkTextBuffer">
<method>RemoveTagByName</method>
</class>
<data>
<attribute target="method">
<name>name</name>
<value>RemoveTag</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkItemFactory">
<method>GetItemByAction</method>
</class>
<data>
<attribute target="method">
<name>name</name>
<value>GetItem</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkItemFactory">
<method>GetWidgetByAction</method>
</class>
<data>
<attribute target="method">
<name>name</name>
<value>GetWidget</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkHTML">
<method>BeginContent</method>
</class>
<data>
<attribute target="method">
<name>name</name>
<value>Begin</value>
</attribute>
</data>
</rule>
<rule>
<class name="GtkHTML">
<method>BeginFull</method>
</class>
<data>
<attribute target="method">
<name>name</name>
<value>Begin</value>
</attribute>
</data>
</rule>
<!-- disable default constructor -->
<rule>
<class name="GtkScrolledWindow"/>

View file

@ -1,14 +1,34 @@
cvs server: I know nothing about gtkhtml
cvs server: Diffing gtkhtml
cvs server: Diffing gtkhtml/src
Index: gtkhtml/src/gtkhtml-enums.h
Index: 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/src/gtkhtml-enums.h 19 May 2003 14:41:02 -0000 1.35
+++ gtkhtml/src/gtkhtml-enums.h 15 Jul 2003 22:39:15 -0000
@@ -263,13 +263,13 @@ typedef enum {
--- gtkhtml-enums.h 19 May 2003 14:41:02 -0000 1.35
+++ gtkhtml-enums.h 16 Jul 2003 01:51:37 -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,