GtkSharp/sources/gtkhtml-font-style-enum.patch
Duncan Mak 870b00b76e * 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
2003-07-16 02:07:51 +00:00

52 lines
2.1 KiB
Diff

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-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,
- 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 {