reintroduce GtkWidgetFlags API

2007-08-27  Mathias Hasselmann  <mathias.hasselmann@gmx.de>

	* vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala,
	vapi/gtk+-2.0.vala: reintroduce GtkWidgetFlags API

svn path=/trunk/; revision=513

diff --git a/ChangeLog b/ChangeLog
index f78069b..cd52db8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-08-27  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
 
+       * vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala,
+       vapi/gtk+-2.0.vala: reintroduce GtkWidgetFlags API
+
+2007-08-27  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
+
        * vapi/packages/pango/pango-custom.vala:
        fix signature of Pango.Language.to_string
 

diff --git a/vapi/gtk+-2.0.vala b/vapi/gtk+-2.0.vala
index e2c4c18..59a72fc 100644 (file)
--- a/vapi/gtk+-2.0.vala
+++ b/vapi/gtk+-2.0.vala
@@ -4693,6 +4693,9 @@ namespace Gtk {
                public bool translate_coordinates (Gtk.Widget dest_widget, int src_x, int src_y, int dest_x, int dest_y);
                public void trigger_tooltip_query ();
                public void unparent ();
+               public Gtk.WidgetFlags get_flags ();
+               public void set_flags (Gtk.WidgetFlags flags);
+               public void unset_flags (Gtk.WidgetFlags flags);
                public weak string name { get; set; }
                public weak Gtk.Container parent { get; set; }
                [NoAccessorMethod]
@@ -5173,13 +5176,6 @@ namespace Gtk {
                [HasEmitter]
                public signal void sort_column_changed ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public struct Allocation {
-               public int x;
-               public int y;
-               public int width;
-               public int height;
-       }
        [ReferenceType]
        [CCode (cheader_filename = "gtk/gtk.h")]
        public struct CacheInfo {
@@ -6228,6 +6224,13 @@ namespace Gtk {
        public struct Type {
                public pointer @class ();
        }
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public struct Allocation {
+               public int x;
+               public int y;
+               public int width;
+               public int height;
+       }
        public static delegate void AboutDialogActivateLinkFunc (Gtk.AboutDialog about, string link_, pointer data);
        public static delegate bool AccelGroupActivate (Gtk.AccelGroup accel_group, GLib.Object acceleratable, uint keyval, Gdk.ModifierType modifier);
        public static delegate bool AccelGroupFindFunc (Gtk.AccelKey key, GLib.Closure closure, pointer data);
@@ -6389,9 +6392,6 @@ namespace Gtk {
        public const string STOCK_ZOOM_FIT;
        public const string STOCK_ZOOM_IN;
        public const string STOCK_ZOOM_OUT;
-       public static void init (out string[] args);
-       public static void main ();
-       public static void main_quit ();
        public static bool alternative_dialog_button_order (Gdk.Screen screen);
        public static GLib.Type cell_type_get_type ();
        public static weak string check_version (uint required_major, uint required_minor, uint required_micro);
@@ -6434,4 +6434,7 @@ namespace Gtk {
        public static weak string set_locale ();
        public static void show_about_dialog (Gtk.Window parent, ...);
        public static void text_layout_draw (pointer layout, Gtk.Widget widget, Gdk.Drawable drawable, Gdk.GC cursor_gc, int x_offset, int y_offset, int x, int y, int width, int height, GLib.List widgets);
+       public static void init (out string[] args);
+       public static void main ();
+       public static void main_quit ();
 }

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala b/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
index 7b42147..6064e45 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
@@ -34,4 +34,18 @@ namespace Gtk {
                public int width;
                public int height;
        }
+
+       public class Widget {
+               [Import]
+               [CCode (cname = "GTK_WIDGET_FLAGS")]
+               public WidgetFlags get_flags ();
+
+               [Import]
+               [CCode (cname = "GTK_WIDGET_SET_FLAGS")]
+               public void set_flags (WidgetFlags flags);
+
+               [Import]
+               [CCode (cname = "GTK_WIDGET_UNSET_FLAGS")]
+               public void unset_flags (WidgetFlags flags);
+       }
 }