Changed many classes to structs, fixes bug 540349. Also fix fields that

2008-06-30  Jared Moore  <jaredm@svn.gnome.org>

	* vapi/packages/gdk-2.0/gdk-2.0.metadata:

	Changed many classes to structs, fixes bug 540349. Also fix fields
	that should be arrays of structs, and hide several "Gdk*Class"
	structs.

	* vapi/gdk-2.0.vapi: Regenerated

svn path=/trunk/; revision=1663

diff --git a/ChangeLog b/ChangeLog
index b41fce0..4c17e82 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2008-06-30  Jared Moore  <jaredm@svn.gnome.org>
 
+       * vapi/packages/gdk-2.0/gdk-2.0.metadata:
+
+       Changed many classes to structs, fixes bug 540349. Also fix fields
+       that should be arrays of structs, and hide several "Gdk*Class"
+       structs.
+
+       * vapi/gdk-2.0.vapi: Regenerated
+
+2008-06-30  Jared Moore  <jaredm@svn.gnome.org>
+
        * vala/valasemanticanalyzer.vala:
 
        Report error when an abstract method has a body, an extern method has

diff --git a/vapi/gdk-2.0.vapi b/vapi/gdk-2.0.vapi
index a06f0c4..91d75fa 100644 (file)
--- a/vapi/gdk-2.0.vapi
+++ b/vapi/gdk-2.0.vapi
@@ -1,4 +1,4 @@
-/* gdk-2.0.vapi generated by lt-vapigen, do not modify. */
+/* gdk-2.0.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_")]
 namespace Gdk {
@@ -532,33 +532,12 @@ namespace Gdk {
        }
        [Compact]
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public class AppLaunchContextClass {
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
        public class Bitmap {
                public weak GLib.Object parent_instance;
                public static weak Gdk.Bitmap create_from_data (Gdk.Drawable drawable, string data, int width, int height);
        }
        [Compact]
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public class DeviceAxis {
-               public Gdk.AxisUse use;
-               public double min;
-               public double max;
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class DeviceClass {
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class DeviceKey {
-               public uint keyval;
-               public Gdk.ModifierType modifiers;
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
        public class DisplayPointerHooks {
                public weak GLib.Callback get_pointer;
                public weak GLib.Callback window_get_pointer;
@@ -566,81 +545,6 @@ namespace Gdk {
        }
        [Compact]
        [CCode (cheader_filename = "gdk/gdk.h")]
-       public class GCValues {
-               public Gdk.Color foreground;
-               public Gdk.Color background;
-               public weak Gdk.Font font;
-               public Gdk.Function function;
-               public Gdk.Fill fill;
-               public weak Gdk.Pixmap tile;
-               public weak Gdk.Pixmap stipple;
-               public weak Gdk.Pixmap clip_mask;
-               public Gdk.SubwindowMode subwindow_mode;
-               public int ts_x_origin;
-               public int ts_y_origin;
-               public int clip_x_origin;
-               public int clip_y_origin;
-               public int graphics_exposures;
-               public int line_width;
-               public Gdk.LineStyle line_style;
-               public Gdk.CapStyle cap_style;
-               public Gdk.JoinStyle join_style;
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class Geometry {
-               public int min_width;
-               public int min_height;
-               public int max_width;
-               public int max_height;
-               public int base_width;
-               public int base_height;
-               public int width_inc;
-               public int height_inc;
-               public double min_aspect;
-               public double max_aspect;
-               public Gdk.Gravity win_gravity;
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class KeymapKey {
-               public uint keycode;
-               public int group;
-               public int level;
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class NativeWindow {
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class PangoAttrEmbossColor {
-               public weak Pango.Attribute attr;
-               public Pango.Color color;
-               public PangoAttrEmbossColor (Gdk.Color color);
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class PangoAttrEmbossed {
-               public weak Pango.Attribute attr;
-               public bool embossed;
-               public PangoAttrEmbossed (bool embossed);
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class PangoAttrStipple {
-               public weak Pango.Attribute attr;
-               public weak Gdk.Bitmap stipple;
-               public PangoAttrStipple (Gdk.Bitmap stipple);
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class Point {
-               public int x;
-               public int y;
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
        public class PointerHooks {
                public weak GLib.Callback get_pointer;
                public weak GLib.Callback window_at_pointer;
@@ -668,64 +572,6 @@ namespace Gdk {
                public void xor (Gdk.Region source2);
        }
        [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class RgbCmap {
-               [NoArrayLength]
-               public weak uint[] colors;
-               public int n_colors;
-               public weak GLib.SList info_list;
-               public RgbCmap (uint[] colors);
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class Segment {
-               public int x1;
-               public int y1;
-               public int x2;
-               public int y2;
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class Span {
-               public int x;
-               public int y;
-               public int width;
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class TimeCoord {
-               public uint time;
-               [NoArrayLength]
-               public weak double[] axes;
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class Trapezoid {
-               public double y1;
-               public double x11;
-               public double x21;
-               public double y2;
-               public double x12;
-               public double x22;
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class VisualClass {
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class WChar {
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class WindowRedirect {
-               public static void to_drawable (Gdk.Window window, Gdk.Drawable drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
-       }
-       [Compact]
-       [CCode (cheader_filename = "gdk/gdk.h")]
-       public class XEvent {
-       }
-       [Compact]
        [CCode (ref_function = "gdk_cursor_ref", unref_function = "gdk_cursor_unref", cheader_filename = "gdk/gdk.h")]
        public class Cursor {
                public Gdk.CursorType type;
@@ -782,9 +628,11 @@ namespace Gdk {
                public Gdk.InputMode mode;
                public bool has_cursor;
                public int num_axes;
-               public weak Gdk.DeviceAxis axes;
+               [NoArrayLength]
+               public weak Gdk.DeviceAxis[] axes;
                public int num_keys;
-               public weak Gdk.DeviceKey keys;
+               [NoArrayLength]
+               public weak Gdk.DeviceKey[] keys;
                public static void free_history (Gdk.TimeCoord[] events);
                public bool get_axis (double axes, Gdk.AxisUse use, double value);
                public static weak Gdk.Device get_core_pointer ();
@@ -985,7 +833,7 @@ namespace Gdk {
                public weak Gdk.Display display;
                public static weak Gdk.Keymap get_default ();
                public Pango.Direction get_direction ();
-               public bool get_entries_for_keycode (uint hardware_keycode, out weak Gdk.KeymapKey keys, uint keyvals, int n_entries);
+               public bool get_entries_for_keycode (uint hardware_keycode, out weak Gdk.KeymapKey[] keys, out weak uint[] keyvals, int n_entries);
                public bool get_entries_for_keyval (uint keyval, Gdk.KeymapKey[] keys);
                public static weak Gdk.Keymap get_for_display (Gdk.Display display);
                public bool have_bidi_layouts ();
@@ -1221,6 +1069,17 @@ namespace Gdk {
                public weak string name ();
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
+       public struct DeviceAxis {
+               public Gdk.AxisUse use;
+               public double min;
+               public double max;
+       }
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       public struct DeviceKey {
+               public uint keyval;
+               public Gdk.ModifierType modifiers;
+       }
+       [CCode (cheader_filename = "gdk/gdk.h")]
        public struct EventAny {
                public Gdk.EventType type;
                public weak Gdk.Window window;
@@ -1352,7 +1211,7 @@ namespace Gdk {
                public Gdk.EventType type;
                public weak Gdk.Window window;
                public char send_event;
-               public weak Gdk.NativeWindow owner;
+               public Gdk.NativeWindow owner;
                public Gdk.OwnerChange reason;
                public Gdk.Atom selection;
                public uint time;
@@ -1398,7 +1257,7 @@ namespace Gdk {
                public Gdk.Atom target;
                public Gdk.Atom property;
                public uint time;
-               public weak Gdk.NativeWindow requestor;
+               public Gdk.NativeWindow requestor;
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
        public struct EventSetting {
@@ -1424,6 +1283,117 @@ namespace Gdk {
                public Gdk.WindowState new_window_state;
        }
        [CCode (cheader_filename = "gdk/gdk.h")]
+       public struct GCValues {
+               public Gdk.Color foreground;
+               public Gdk.Color background;
+               public weak Gdk.Font font;
+               public Gdk.Function function;
+               public Gdk.Fill fill;
+               public weak Gdk.Pixmap tile;
+               public weak Gdk.Pixmap stipple;
+               public weak Gdk.Pixmap clip_mask;
+               public Gdk.SubwindowMode subwindow_mode;
+               public int ts_x_origin;
+               public int ts_y_origin;
+               public int clip_x_origin;
+               public int clip_y_origin;
+               public int graphics_exposures;
+               public int line_width;
+               public Gdk.LineStyle line_style;
+               public Gdk.CapStyle cap_style;
+               public Gdk.JoinStyle join_style;
+       }
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       public struct Geometry {
+               public int min_width;
+               public int min_height;
+               public int max_width;
+               public int max_height;
+               public int base_width;
+               public int base_height;
+               public int width_inc;
+               public int height_inc;
+               public double min_aspect;
+               public double max_aspect;
+               public Gdk.Gravity win_gravity;
+       }
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       public struct KeymapKey {
+               public uint keycode;
+               public int group;
+               public int level;
+       }
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       public struct NativeWindow {
+       }
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       public struct PangoAttrEmbossColor {
+               public weak Pango.Attribute attr;
+               public Pango.Color color;
+               [CCode (cname = "gdk_pango_attr_emboss_color_new")]
+               public PangoAttrEmbossColor (Gdk.Color color);
+       }
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       public struct PangoAttrEmbossed {
+               public weak Pango.Attribute attr;
+               public bool embossed;
+               [CCode (cname = "gdk_pango_attr_embossed_new")]
+               public PangoAttrEmbossed (bool embossed);
+       }
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       public struct PangoAttrStipple {
+               public weak Pango.Attribute attr;
+               public weak Gdk.Bitmap stipple;
+               [CCode (cname = "gdk_pango_attr_stipple_new")]
+               public PangoAttrStipple (Gdk.Bitmap stipple);
+       }
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       public struct Point {
+               public int x;
+               public int y;
+       }
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       public struct RgbCmap {
+               [NoArrayLength]
+               public weak uint[] colors;
+               public int n_colors;
+               public weak GLib.SList info_list;
+               public void free ();
+               [CCode (cname = "gdk_rgb_cmap_new")]
+               public RgbCmap (uint[] colors);
+       }
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       public struct Segment {
+               public int x1;
+               public int y1;
+               public int x2;
+               public int y2;
+       }
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       public struct Span {
+               public int x;
+               public int y;
+               public int width;
+       }
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       public struct TimeCoord {
+               public uint time;
+               [NoArrayLength]
+               public weak double[] axes;
+       }
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       public struct Trapezoid {
+               public double y1;
+               public double x11;
+               public double x21;
+               public double y2;
+               public double x12;
+               public double x22;
+       }
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       public struct WChar {
+       }
+       [CCode (cheader_filename = "gdk/gdk.h")]
        public struct WindowAttr {
                public weak string title;
                public int event_mask;
@@ -1441,6 +1411,13 @@ namespace Gdk {
                public bool override_redirect;
                public Gdk.WindowTypeHint type_hint;
        }
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       public struct WindowRedirect {
+               public static void to_drawable (Gdk.Window window, Gdk.Drawable drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
+       }
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       public struct XEvent {
+       }
        [CCode (type_id = "GDK_TYPE_COLOR", cheader_filename = "gdk/gdk.h")]
        public struct Color {
                public uint pixel;

diff --git a/vapi/packages/gdk-2.0/gdk-2.0.metadata b/vapi/packages/gdk-2.0/gdk-2.0.metadata
index 62b2bf3..95bc1f0 100644 (file)
--- a/vapi/packages/gdk-2.0/gdk-2.0.metadata
+++ b/vapi/packages/gdk-2.0/gdk-2.0.metadata
@@ -1,4 +1,5 @@
 Gdk cheader_filename="gdk/gdk.h"
+GdkAppLaunchContextClass hidden="1"
 GdkAtom is_value_type="1" simple_type="1"
 gdk_cairo_create transfer_ownership="1"
 GdkColor is_value_type="1"
@@ -7,6 +8,11 @@ gdk_colormap_alloc_colors.colors is_array="1"
 gdk_colormap_free_colors.colors is_array="1"
 gdk_colormap_query_color.result is_out="1"
 GdkCursor is_value_type="0"
+GdkDevice.axes is_array="1"
+GdkDevice.keys is_array="1"
+GdkDeviceAxis is_value_type="1"
+GdkDeviceClass hidden="1"
+GdkDeviceKey is_value_type="1"
 GdkDisplay.closed hidden="1"
 gdk_drawable_get_size.width is_out="1"
 gdk_drawable_get_size.height is_out="1"
@@ -17,22 +23,37 @@ gdk_event_get_coords.x_win is_out="1"
 gdk_event_get_coords.y_win is_out="1"
 gdk_event_get_root_coords.x_root is_out="1"
 gdk_event_get_root_coords.y_root is_out="1"
+GdkGCValues is_value_type="1"
+GdkGeometry is_value_type="1"
 gdk_init.argc hidden="1"
 gdk_init.argv is_array="1" is_ref="1" array_length_pos="0.9"
 gdk_init_check.argc hidden="1"
 gdk_init_check.argv is_array="1" is_ref="1" array_length_pos="0.9"
+gdk_keymap_get_entries_for_keycode.keys is_array="1" is_out="1" nullable="1"
+gdk_keymap_get_entries_for_keycode.keyvals is_array="1" is_out="1" nullable="1"
+GdkKeymapKey is_value_type="1"
+GdkNativeWindow is_value_type="1"
+GdkPangoAttr* is_value_type="1"
 gdk_pixbuf_get_from_drawable.dest nullable="1"
 gdk_pixbuf_get_from_drawable.cmap nullable="1"
 gdk_pixbuf_get_from_image.dest nullable="1"
 gdk_pixbuf_get_from_image.cmap nullable="1"
 GdkPixmapObject hidden="1"
 GdkPixmapObjectClass hidden="1"
+GdkPoint is_value_type="1"
 gdk_property_get.actual_property_type is_out="1"
 GdkRectangle is_value_type="1"
 gdk_rectangle_union.dest is_out="1"
 gdk_region_get_clipbox.rectangle is_out="1"
 gdk_rgb_find_color.color is_ref="1"
+GdkRgbCmap is_value_type="1"
 gdk_screen_get_monitor_geometry.dest is_out="1"
+GdkSegment is_value_type="1"
+GdkSpan is_value_type="1"
+GdkTimeCoord is_value_type="1"
+GdkTrapezoid is_value_type="1"
+GdkVisualClass hidden="1"
+GdkWChar is_value_type="1"
 gdk_window_get_frame_extents.rect is_out="1"
 gdk_window_get_origin.x is_out="1"
 gdk_window_get_origin.y is_out="1"
@@ -40,9 +61,11 @@ GdkWindowAttr is_value_type="1"
 GdkWindowClass common_prefix="GDK_"
 GdkWindowObject hidden="1"
 GdkWindowObjectClass hidden="1"
+GdkWindowRedirect is_value_type="1"
 gdk_window_get_geometry.x is_out="1"
 gdk_window_get_geometry.y is_out="1"
 gdk_window_get_geometry.width is_out="1"
 gdk_window_get_geometry.height is_out="1"
 gdk_window_get_geometry.depth is_out="1"
 gdk_window_invalidate_rect.rect nullable="1"
+GdkXEvent is_value_type="1"