+2006-11-02 Jürg Billeter <j@bitron.ch>
+
+ * vala/valainterfacewriter.vala: don't use weak for value types
+ * vala/valamethod.vala: make set_cname public
+ * vapi/atk.vala, vapi/gdk-2.0.vala, vapi/gtk+-2.0.vala, vapi/pango.vala:
+ add Gtk.Allocation, don't use weak for value types
+
2006-10-31 Jürg Billeter <j@bitron.ch>
* vala/valacodegenerator.vala: don't add NULL to end of variable
write_indent ();
write_string ("public ");
- if (!f.type_reference.takes_ownership) {
+ if (f.type_reference.data_type != null &&
+ f.type_reference.data_type.is_reference_type () &&
+ !f.type_reference.takes_ownership) {
write_string ("weak ");
}
write_string (f.type_reference.data_type.symbol.get_full_name ());
}
}
- private void set_cname (string cname) {
+ /**
+ * Sets the name of this method as it is used in C code.
+ *
+ * @param cname the name to be used in C code
+ */
+ public void set_cname (string cname) {
this.cname = cname;
}
}
[ReferenceType ()]
public struct KeyEventStruct {
- public weak int type;
- public weak uint state;
- public weak uint keyval;
- public weak int length;
+ public int type;
+ public uint state;
+ public uint keyval;
+ public int length;
public weak string string;
- public weak ushort keycode;
- public weak uint timestamp;
+ public ushort keycode;
+ public uint timestamp;
}
[ReferenceType ()]
public struct PropertyValues {
public weak GLib.Value new_value;
}
public struct Rectangle {
- public weak int x;
- public weak int y;
- public weak int width;
- public weak int height;
+ public int x;
+ public int y;
+ public int width;
+ public int height;
[NoArrayLength ()]
public static GLib.Type get_type ();
}
[ReferenceType ()]
public struct TextRange {
public weak Atk.TextRectangle bounds;
- public weak int start_offset;
- public weak int end_offset;
+ public int start_offset;
+ public int end_offset;
public weak string content;
}
[ReferenceType ()]
public struct TextRectangle {
- public weak int x;
- public weak int y;
- public weak int width;
- public weak int height;
+ public int x;
+ public int y;
+ public int width;
+ public int height;
}
[ReferenceType ()]
public struct Focus {
DND,
}
public class Colormap : GLib.Object {
- public weak int size;
- public weak Gdk.Color colors;
+ public int size;
+ public Gdk.Color colors;
[NoArrayLength ()]
public bool alloc_color (Gdk.Color color, bool writeable, bool best_match);
[NoArrayLength ()]
public signal void display_opened (Gdk.Display display);
}
public class DragContext : GLib.Object {
- public weak Gdk.DragProtocol protocol;
- public weak bool is_source;
+ public Gdk.DragProtocol protocol;
+ public bool is_source;
public weak Gdk.Window source_window;
public weak Gdk.Window dest_window;
public weak GLib.List targets;
- public weak Gdk.DragAction actions;
- public weak Gdk.DragAction suggested_action;
- public weak Gdk.DragAction action;
- public weak uint start_time;
+ public Gdk.DragAction actions;
+ public Gdk.DragAction suggested_action;
+ public Gdk.DragAction action;
+ public uint start_time;
[NoArrayLength ()]
public static GLib.Type get_type ();
[NoArrayLength ()]
public virtual void set_values (Gdk.GCValues values, Gdk.GCValuesMask values_mask);
}
public class Image : GLib.Object {
- public weak Gdk.ImageType type;
+ public Gdk.ImageType type;
public weak Gdk.Visual visual;
- public weak Gdk.ByteOrder byte_order;
- public weak int width;
- public weak int height;
- public weak ushort depth;
- public weak ushort bpp;
- public weak ushort bpl;
- public weak ushort bits_per_pixel;
- public weak pointer mem;
+ public Gdk.ByteOrder byte_order;
+ public int width;
+ public int height;
+ public ushort depth;
+ public ushort bpp;
+ public ushort bpl;
+ public ushort bits_per_pixel;
+ public pointer mem;
public weak Gdk.Colormap colormap;
[NoArrayLength ()]
public Gdk.Colormap get_colormap ();
}
[ReferenceType ()]
public struct BRESINFO {
- public weak int minor_axis;
- public weak int d;
- public weak int m;
- public weak int m1;
- public weak int incr1;
- public weak int incr2;
+ public int minor_axis;
+ public int d;
+ public int m;
+ public int m1;
+ public int incr1;
+ public int incr2;
}
[ReferenceType ()]
public struct EdgeTable {
- public weak int ymax;
- public weak int ymin;
+ public int ymax;
+ public int ymin;
public weak Gdk.ScanLineList scanlines;
}
[ReferenceType ()]
public struct EdgeTableEntry {
}
public struct Color {
- public weak uint pixel;
- public weak ushort red;
- public weak ushort green;
- public weak ushort blue;
+ public uint pixel;
+ public ushort red;
+ public ushort green;
+ public ushort blue;
[NoArrayLength ()]
[InstanceByReference ()]
public Gdk.Color copy ();
public static bool parse (string spec, Gdk.Color color);
}
public struct Cursor {
- public weak Gdk.CursorType type;
+ public Gdk.CursorType type;
[NoArrayLength ()]
[InstanceByReference ()]
public Gdk.Display get_display ();
}
[ReferenceType ()]
public struct DeviceAxis {
- public weak Gdk.AxisUse use;
- public weak double min;
- public weak double max;
+ public Gdk.AxisUse use;
+ public double min;
+ public double max;
}
[ReferenceType ()]
public struct DeviceKey {
- public weak uint keyval;
- public weak Gdk.ModifierType modifiers;
+ public uint keyval;
+ public Gdk.ModifierType modifiers;
}
[ReferenceType ()]
public struct DisplayPointerHooks {
}
[ReferenceType ()]
public struct EventAny {
- public weak Gdk.EventType type;
+ public Gdk.EventType type;
public weak Gdk.Window window;
- public weak char send_event;
+ public char send_event;
}
[ReferenceType ()]
public struct EventButton {
- public weak Gdk.EventType type;
+ public Gdk.EventType type;
public weak Gdk.Window window;
- public weak char send_event;
- public weak uint time;
- public weak double x;
- public weak double y;
- public weak double axes;
- public weak uint state;
- public weak uint button;
+ public char send_event;
+ public uint time;
+ public double x;
+ public double y;
+ public double axes;
+ public uint state;
+ public uint button;
public weak Gdk.Device device;
- public weak double x_root;
- public weak double y_root;
+ public double x_root;
+ public double y_root;
}
[ReferenceType ()]
public struct EventClient {
- public weak Gdk.EventType type;
+ public Gdk.EventType type;
public weak Gdk.Window window;
- public weak char send_event;
- public weak Gdk.Atom message_type;
- public weak ushort data_format;
- public weak char b;
+ public char send_event;
+ public Gdk.Atom message_type;
+ public ushort data_format;
+ public char b;
}
[ReferenceType ()]
public struct EventConfigure {
- public weak Gdk.EventType type;
+ public Gdk.EventType type;
public weak Gdk.Window window;
- public weak char send_event;
- public weak int x;
- public weak int y;
- public weak int width;
- public weak int height;
+ public char send_event;
+ public int x;
+ public int y;
+ public int width;
+ public int height;
}
[ReferenceType ()]
public struct EventCrossing {
- public weak Gdk.EventType type;
+ public Gdk.EventType type;
public weak Gdk.Window window;
- public weak char send_event;
+ public char send_event;
public weak Gdk.Window subwindow;
- public weak uint time;
- public weak double x;
- public weak double y;
- public weak double x_root;
- public weak double y_root;
- public weak Gdk.CrossingMode mode;
- public weak Gdk.NotifyType detail;
- public weak bool focus;
- public weak uint state;
+ public uint time;
+ public double x;
+ public double y;
+ public double x_root;
+ public double y_root;
+ public Gdk.CrossingMode mode;
+ public Gdk.NotifyType detail;
+ public bool focus;
+ public uint state;
}
[ReferenceType ()]
public struct EventDND {
- public weak Gdk.EventType type;
+ public Gdk.EventType type;
public weak Gdk.Window window;
- public weak char send_event;
+ public char send_event;
public weak Gdk.DragContext context;
- public weak uint time;
- public weak short x_root;
- public weak short y_root;
+ public uint time;
+ public short x_root;
+ public short y_root;
}
[ReferenceType ()]
public struct EventExpose {
- public weak Gdk.EventType type;
+ public Gdk.EventType type;
public weak Gdk.Window window;
- public weak char send_event;
- public weak Gdk.Rectangle area;
+ public char send_event;
+ public Gdk.Rectangle area;
public weak Gdk.Region region;
- public weak int count;
+ public int count;
}
[ReferenceType ()]
public struct EventFocus {
- public weak Gdk.EventType type;
+ public Gdk.EventType type;
public weak Gdk.Window window;
- public weak char send_event;
- public weak short @in;
+ public char send_event;
+ public short @in;
}
[ReferenceType ()]
public struct EventGrabBroken {
- public weak Gdk.EventType type;
+ public Gdk.EventType type;
public weak Gdk.Window window;
- public weak char send_event;
- public weak bool keyboard;
- public weak bool implicit;
+ public char send_event;
+ public bool keyboard;
+ public bool implicit;
public weak Gdk.Window grab_window;
}
[ReferenceType ()]
public struct EventKey {
- public weak Gdk.EventType type;
+ public Gdk.EventType type;
public weak Gdk.Window window;
- public weak char send_event;
- public weak uint time;
- public weak uint state;
- public weak uint keyval;
- public weak int length;
+ public char send_event;
+ public uint time;
+ public uint state;
+ public uint keyval;
+ public int length;
public weak string string;
- public weak ushort hardware_keycode;
- public weak uchar group;
- public weak uint is_modifier;
+ public ushort hardware_keycode;
+ public uchar group;
+ public uint is_modifier;
}
[ReferenceType ()]
public struct EventMotion {
- public weak Gdk.EventType type;
+ public Gdk.EventType type;
public weak Gdk.Window window;
- public weak char send_event;
- public weak uint time;
- public weak double x;
- public weak double y;
- public weak double axes;
- public weak uint state;
- public weak short is_hint;
+ public char send_event;
+ public uint time;
+ public double x;
+ public double y;
+ public double axes;
+ public uint state;
+ public short is_hint;
public weak Gdk.Device device;
- public weak double x_root;
- public weak double y_root;
+ public double x_root;
+ public double y_root;
}
[ReferenceType ()]
public struct EventNoExpose {
- public weak Gdk.EventType type;
+ public Gdk.EventType type;
public weak Gdk.Window window;
- public weak char send_event;
+ public char send_event;
}
[ReferenceType ()]
public struct EventOwnerChange {
- public weak Gdk.EventType type;
+ public Gdk.EventType type;
public weak Gdk.Window window;
- public weak char send_event;
- public weak pointer owner;
- public weak Gdk.OwnerChange reason;
- public weak Gdk.Atom selection;
- public weak uint time;
- public weak uint selection_time;
+ public char send_event;
+ public pointer owner;
+ public Gdk.OwnerChange reason;
+ public Gdk.Atom selection;
+ public uint time;
+ public uint selection_time;
}
[ReferenceType ()]
public struct EventProperty {
- public weak Gdk.EventType type;
+ public Gdk.EventType type;
public weak Gdk.Window window;
- public weak char send_event;
- public weak Gdk.Atom atom;
- public weak uint time;
- public weak uint state;
+ public char send_event;
+ public Gdk.Atom atom;
+ public uint time;
+ public uint state;
}
[ReferenceType ()]
public struct EventProximity {
- public weak Gdk.EventType type;
+ public Gdk.EventType type;
public weak Gdk.Window window;
- public weak char send_event;
- public weak uint time;
+ public char send_event;
+ public uint time;
public weak Gdk.Device device;
}
[ReferenceType ()]
public struct EventScroll {
- public weak Gdk.EventType type;
+ public Gdk.EventType type;
public weak Gdk.Window window;
- public weak char send_event;
- public weak uint time;
- public weak double x;
- public weak double y;
- public weak uint state;
- public weak Gdk.ScrollDirection direction;
+ public char send_event;
+ public uint time;
+ public double x;
+ public double y;
+ public uint state;
+ public Gdk.ScrollDirection direction;
public weak Gdk.Device device;
- public weak double x_root;
- public weak double y_root;
+ public double x_root;
+ public double y_root;
}
[ReferenceType ()]
public struct EventSelection {
- public weak Gdk.EventType type;
+ public Gdk.EventType type;
public weak Gdk.Window window;
- public weak char send_event;
- public weak Gdk.Atom selection;
- public weak Gdk.Atom target;
- public weak Gdk.Atom property;
- public weak uint time;
- public weak pointer requestor;
+ public char send_event;
+ public Gdk.Atom selection;
+ public Gdk.Atom target;
+ public Gdk.Atom property;
+ public uint time;
+ public pointer requestor;
}
[ReferenceType ()]
public struct EventSetting {
- public weak Gdk.EventType type;
+ public Gdk.EventType type;
public weak Gdk.Window window;
- public weak char send_event;
- public weak Gdk.SettingAction action;
+ public char send_event;
+ public Gdk.SettingAction action;
public weak string name;
}
[ReferenceType ()]
public struct EventVisibility {
- public weak Gdk.EventType type;
+ public Gdk.EventType type;
public weak Gdk.Window window;
- public weak char send_event;
- public weak Gdk.VisibilityState state;
+ public char send_event;
+ public Gdk.VisibilityState state;
}
[ReferenceType ()]
public struct EventWindowState {
- public weak Gdk.EventType type;
+ public Gdk.EventType type;
public weak Gdk.Window window;
- public weak char send_event;
- public weak Gdk.WindowState changed_mask;
- public weak Gdk.WindowState new_window_state;
+ public char send_event;
+ public Gdk.WindowState changed_mask;
+ public Gdk.WindowState new_window_state;
}
public struct Font {
- public weak Gdk.FontType type;
- public weak int ascent;
- public weak int descent;
+ public Gdk.FontType type;
+ public int ascent;
+ public int descent;
}
[ReferenceType ()]
public struct GCValues {
- public weak Gdk.Color foreground;
- public weak Gdk.Color background;
- public weak Gdk.Font font;
- public weak Gdk.Function function;
- public weak Gdk.Fill fill;
+ public Gdk.Color foreground;
+ public Gdk.Color background;
+ public 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 weak Gdk.SubwindowMode subwindow_mode;
- public weak int ts_x_origin;
- public weak int ts_y_origin;
- public weak int clip_x_origin;
- public weak int clip_y_origin;
- public weak int graphics_exposures;
- public weak int line_width;
- public weak Gdk.LineStyle line_style;
- public weak Gdk.CapStyle cap_style;
- public weak Gdk.JoinStyle join_style;
+ 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;
}
[ReferenceType ()]
public struct Geometry {
- public weak int min_width;
- public weak int min_height;
- public weak int max_width;
- public weak int max_height;
- public weak int base_width;
- public weak int base_height;
- public weak int width_inc;
- public weak int height_inc;
- public weak double min_aspect;
- public weak double max_aspect;
- public weak Gdk.Gravity win_gravity;
+ 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;
}
[ReferenceType ()]
public struct KeymapKey {
- public weak uint keycode;
- public weak int group;
- public weak int level;
+ public uint keycode;
+ public int group;
+ public int level;
}
[ReferenceType ()]
public struct PangoAttrEmbossed {
public weak Pango.Attribute attr;
- public weak bool embossed;
+ public bool embossed;
[NoArrayLength ()]
public construct (bool embossed);
}
[ReferenceType ()]
public struct PixbufFrame {
public weak Gdk.Pixbuf pixbuf;
- public weak int x_offset;
- public weak int y_offset;
- public weak int delay_time;
- public weak int elapsed;
- public weak Gdk.PixbufFrameAction action;
- public weak bool need_recomposite;
- public weak bool bg_transparent;
+ public int x_offset;
+ public int y_offset;
+ public int delay_time;
+ public int elapsed;
+ public Gdk.PixbufFrameAction action;
+ public bool need_recomposite;
+ public bool bg_transparent;
public weak Gdk.Pixbuf composited;
public weak Gdk.Pixbuf revert;
}
[ReferenceType ()]
public struct Pixdata {
- public weak uint magic;
- public weak int length;
- public weak uint pixdata_type;
- public weak uint rowstride;
- public weak uint width;
- public weak uint height;
- public weak uchar pixel_data;
+ public uint magic;
+ public int length;
+ public uint pixdata_type;
+ public uint rowstride;
+ public uint width;
+ public uint height;
+ public uchar pixel_data;
[NoArrayLength ()]
public bool deserialize (uint stream_length, uchar stream, GLib.Error error);
[NoArrayLength ()]
public struct PixmapObject {
public weak Gdk.Drawable parent_instance;
public weak Gdk.Drawable impl;
- public weak int depth;
+ public int depth;
}
[ReferenceType ()]
public struct Point {
- public weak int x;
- public weak int y;
+ public int x;
+ public int y;
}
[ReferenceType ()]
public struct PointerHooks {
}
public struct Rectangle {
- public weak int x;
- public weak int y;
- public weak int width;
- public weak int height;
+ public int x;
+ public int y;
+ public int width;
+ public int height;
[NoArrayLength ()]
public static GLib.Type get_type ();
[NoArrayLength ()]
}
[ReferenceType ()]
public struct Region {
- public weak long size;
- public weak long numRects;
+ public long size;
+ public long numRects;
public weak Gdk.RegionBox rects;
public weak Gdk.RegionBox extents;
[NoArrayLength ()]
}
[ReferenceType ()]
public struct RegionBox {
- public weak int x1;
- public weak int y1;
- public weak int x2;
- public weak int y2;
+ public int x1;
+ public int y1;
+ public int x2;
+ public int y2;
}
[ReferenceType ()]
public struct RgbCmap {
- public weak uint colors;
- public weak int n_colors;
+ public uint colors;
+ public int n_colors;
[NoArrayLength ()]
public void free ();
[NoArrayLength ()]
}
[ReferenceType ()]
public struct Segment {
- public weak int x1;
- public weak int y1;
- public weak int x2;
- public weak int y2;
+ public int x1;
+ public int y1;
+ public int x2;
+ public int y2;
}
[ReferenceType ()]
public struct Span {
- public weak int x;
- public weak int y;
- public weak int width;
+ public int x;
+ public int y;
+ public int width;
}
[ReferenceType ()]
public struct TimeCoord {
- public weak uint time;
- public weak double axes;
+ public uint time;
+ public double axes;
}
[ReferenceType ()]
public struct Trapezoid {
- public weak double y1;
- public weak double x11;
- public weak double x21;
- public weak double y2;
- public weak double x12;
- public weak double x22;
+ public double y1;
+ public double x11;
+ public double x21;
+ public double y2;
+ public double x12;
+ public double x22;
}
[ReferenceType ()]
public struct WindowAttr {
public weak string title;
- public weak int event_mask;
- public weak int x;
- public weak int y;
- public weak int width;
- public weak int height;
- public weak pointer wclass;
+ public int event_mask;
+ public int x;
+ public int y;
+ public int width;
+ public int height;
+ public pointer wclass;
public weak Gdk.Visual visual;
public weak Gdk.Colormap colormap;
- public weak Gdk.WindowType window_type;
- public weak Gdk.Cursor cursor;
+ public Gdk.WindowType window_type;
+ public Gdk.Cursor cursor;
public weak string wmclass_name;
public weak string wmclass_class;
- public weak bool override_redirect;
+ public bool override_redirect;
}
[ReferenceType ()]
public struct WindowObject {
public weak Gdk.Drawable parent_instance;
public weak Gdk.Drawable impl;
public weak Gdk.WindowObject parent;
- public weak pointer user_data;
- public weak int x;
- public weak int y;
- public weak int extension_events;
+ public pointer user_data;
+ public int x;
+ public int y;
+ public int extension_events;
public weak GLib.List filters;
public weak GLib.List children;
- public weak Gdk.Color bg_color;
+ public Gdk.Color bg_color;
public weak Gdk.Pixmap bg_pixmap;
public weak GLib.SList paint_stack;
public weak Gdk.Region update_area;
- public weak uint update_freeze_count;
- public weak uchar window_type;
- public weak uchar depth;
- public weak uchar resize_count;
- public weak Gdk.WindowState state;
- public weak uint guffaw_gravity;
- public weak uint input_only;
- public weak uint modal_hint;
- public weak uint destroyed;
- public weak uint accept_focus;
- public weak uint focus_on_map;
- public weak uint shaped;
- public weak Gdk.EventMask event_mask;
+ public uint update_freeze_count;
+ public uchar window_type;
+ public uchar depth;
+ public uchar resize_count;
+ public Gdk.WindowState state;
+ public uint guffaw_gravity;
+ public uint input_only;
+ public uint modal_hint;
+ public uint destroyed;
+ public uint accept_focus;
+ public uint focus_on_map;
+ public uint shaped;
+ public Gdk.EventMask event_mask;
[NoArrayLength ()]
public static GLib.Type get_type ();
}
public weak Gtk.Widget fileop_dialog;
public weak Gtk.Widget fileop_entry;
public weak string fileop_file;
- public weak pointer cmpl_state;
+ public pointer cmpl_state;
public weak Gtk.Widget fileop_c_dir;
public weak Gtk.Widget fileop_del_file;
public weak Gtk.Widget fileop_ren_file;
public class RcStyle : GLib.Object {
public weak string name;
public weak string bg_pixmap_name;
- public weak Pango.FontDescription font_desc;
- public weak Gtk.RcFlags color_flags;
- public weak Gdk.Color fg;
- public weak Gdk.Color bg;
- public weak Gdk.Color text;
- public weak Gdk.Color @base;
- public weak int xthickness;
- public weak int ythickness;
+ public Pango.FontDescription font_desc;
+ public Gtk.RcFlags color_flags;
+ public Gdk.Color fg;
+ public Gdk.Color bg;
+ public Gdk.Color text;
+ public Gdk.Color @base;
+ public int xthickness;
+ public int ythickness;
[NoArrayLength ()]
public Gtk.RcStyle copy ();
[NoArrayLength ()]
public signal bool size_changed (int size);
}
public class Style : GLib.Object {
- public weak Gdk.Color fg;
- public weak Gdk.Color bg;
- public weak Gdk.Color light;
- public weak Gdk.Color dark;
- public weak Gdk.Color mid;
- public weak Gdk.Color text;
- public weak Gdk.Color @base;
- public weak Gdk.Color text_aa;
- public weak Gdk.Color black;
- public weak Gdk.Color white;
- public weak Pango.FontDescription font_desc;
- public weak int xthickness;
- public weak int ythickness;
+ public Gdk.Color fg;
+ public Gdk.Color bg;
+ public Gdk.Color light;
+ public Gdk.Color dark;
+ public Gdk.Color mid;
+ public Gdk.Color text;
+ public Gdk.Color @base;
+ public Gdk.Color text_aa;
+ public Gdk.Color black;
+ public Gdk.Color white;
+ public Pango.FontDescription font_desc;
+ public int xthickness;
+ public int ythickness;
public weak Gdk.GC fg_gc;
public weak Gdk.GC bg_gc;
public weak Gdk.GC light_gc;
public signal void toggled ();
}
public class Toolbar : Gtk.Container {
- public weak int num_children;
+ public int num_children;
public weak GLib.List children;
- public weak Gtk.ToolbarStyle style;
+ public Gtk.ToolbarStyle style;
[NoArrayLength ()]
public int get_drop_index (int x, int y);
[NoArrayLength ()]
public construct ();
}
public class Widget : Gtk.Object, Atk.Implementor {
- public weak Gtk.Requisition requisition;
- public weak pointer allocation;
+ public Gtk.Requisition requisition;
+ public Gtk.Allocation allocation;
public weak Gdk.Window window;
[NoArrayLength ()]
public bool activate ();
[HasEmitter ()]
public signal void size_request (Gtk.Requisition requisition);
[HasEmitter ()]
- public signal void size_allocate (pointer allocation);
+ public signal void size_allocate (Gtk.Allocation allocation);
public signal void state_changed (Gtk.StateType previous_state);
public signal void parent_set (Gtk.Widget previous_parent);
public signal void hierarchy_changed (Gtk.Widget previous_toplevel);
[ReferenceType ()]
public struct AccelGroupEntry {
public weak Gtk.AccelKey key;
- public weak GLib.Closure closure;
- public weak GLib.Quark accel_path_quark;
+ public GLib.Closure closure;
+ public GLib.Quark accel_path_quark;
}
[ReferenceType ()]
public struct AccelKey {
- public weak uint accel_key;
- public weak Gdk.ModifierType accel_mods;
- public weak uint accel_flags;
+ public uint accel_key;
+ public Gdk.ModifierType accel_mods;
+ public uint accel_flags;
}
public struct ActionEntry {
public weak string name;
public weak string label;
public weak string accelerator;
public weak string tooltip;
- public weak GLib.Callback @callback;
+ public GLib.Callback @callback;
}
[ReferenceType ()]
public struct BindingArg {
- public weak GLib.Type arg_type;
- public weak long long_data;
+ public GLib.Type arg_type;
+ public long long_data;
}
[ReferenceType ()]
public struct BindingEntry {
- public weak uint keyval;
- public weak Gdk.ModifierType modifiers;
+ public uint keyval;
+ public Gdk.ModifierType modifiers;
public weak Gtk.BindingSet binding_set;
- public weak uint destroyed;
- public weak uint in_emission;
+ public uint destroyed;
+ public uint in_emission;
public weak Gtk.BindingEntry set_next;
public weak Gtk.BindingEntry hash_next;
public weak Gtk.BindingSignal signals;
[ReferenceType ()]
public struct BindingSet {
public weak string set_name;
- public weak int priority;
+ public int priority;
public weak GLib.SList widget_path_pspecs;
public weak GLib.SList widget_class_pspecs;
public weak GLib.SList class_branch_pspecs;
public weak Gtk.BindingEntry entries;
public weak Gtk.BindingEntry current;
- public weak uint parsed;
+ public uint parsed;
[NoArrayLength ()]
public bool activate (uint keyval, Gdk.ModifierType modifiers, Gtk.Object object);
[NoArrayLength ()]
public struct BindingSignal {
public weak Gtk.BindingSignal next;
public weak string signal_name;
- public weak uint n_args;
+ public uint n_args;
public weak Gtk.BindingArg args;
}
public struct Border {
- public weak int left;
- public weak int right;
- public weak int top;
- public weak int bottom;
+ public int left;
+ public int right;
+ public int top;
+ public int bottom;
[NoArrayLength ()]
[InstanceByReference ()]
public Gtk.Border copy ();
[ReferenceType ()]
public struct BoxChild {
public weak Gtk.Widget widget;
- public weak ushort padding;
- public weak uint expand;
- public weak uint fill;
- public weak uint pack;
- public weak uint is_secondary;
+ public ushort padding;
+ public uint expand;
+ public uint fill;
+ public uint pack;
+ public uint is_secondary;
}
[ReferenceType ()]
public struct FileFilterInfo {
- public weak Gtk.FileFilterFlags contains;
+ public Gtk.FileFilterFlags contains;
public weak string filename;
public weak string uri;
public weak string display_name;
[ReferenceType ()]
public struct FixedChild {
public weak Gtk.Widget widget;
- public weak int x;
- public weak int y;
+ public int x;
+ public int y;
}
[ReferenceType ()]
public struct IMContextInfo {
public struct ImageAnimationData {
public weak Gdk.PixbufAnimation anim;
public weak Gdk.PixbufAnimationIter iter;
- public weak uint frame_timeout;
+ public uint frame_timeout;
}
[ReferenceType ()]
public struct ImageIconNameData {
public weak string icon_name;
public weak Gdk.Pixbuf pixbuf;
- public weak uint theme_change_id;
+ public uint theme_change_id;
}
[ReferenceType ()]
public struct ImageIconSetData {
- public weak Gtk.IconSet icon_set;
+ public Gtk.IconSet icon_set;
}
[ReferenceType ()]
public struct ImageImageData {
public struct MenuEntry {
public weak string path;
public weak string accelerator;
- public weak Gtk.MenuCallback @callback;
- public weak pointer callback_data;
+ public Gtk.MenuCallback @callback;
+ public pointer callback_data;
public weak Gtk.Widget widget;
}
[ReferenceType ()]
}
[ReferenceType ()]
public struct PageRange {
- public weak int start;
- public weak int end;
+ public int start;
+ public int end;
}
public struct PaperSize {
[NoArrayLength ()]
public weak string driver;
public weak string device;
public weak string output;
- public weak int @flags;
+ public int @flags;
[NoArrayLength ()]
public void free ();
[NoArrayLength ()]
public weak string label;
public weak string accelerator;
public weak string tooltip;
- public weak int value;
+ public int value;
}
[ReferenceType ()]
public struct RangeLayout {
}
[ReferenceType ()]
public struct RcProperty {
- public weak GLib.Quark type_name;
- public weak GLib.Quark property_name;
+ public GLib.Quark type_name;
+ public GLib.Quark property_name;
public weak string origin;
public weak GLib.Value value;
[NoArrayLength ()]
public weak string app_name;
public weak string app_exec;
public weak string groups;
- public weak bool is_private;
+ public bool is_private;
}
[ReferenceType ()]
public struct RecentFilterInfo {
- public weak Gtk.RecentFilterFlags contains;
+ public Gtk.RecentFilterFlags contains;
public weak string uri;
public weak string display_name;
public weak string mime_type;
public weak string applications;
public weak string groups;
- public weak int age;
+ public int age;
}
public struct RecentInfo {
[NoArrayLength ()]
public void unref ();
}
public struct Requisition {
- public weak int width;
- public weak int height;
+ public int width;
+ public int height;
[NoArrayLength ()]
[InstanceByReference ()]
public Gtk.Requisition copy ();
public struct RulerMetric {
public weak string metric_name;
public weak string abbrev;
- public weak double pixels_per_unit;
- public weak double ruler_scale;
- public weak int subdivide;
+ public double pixels_per_unit;
+ public double ruler_scale;
+ public int subdivide;
}
public struct SelectionData {
- public weak Gdk.Atom selection;
- public weak Gdk.Atom target;
- public weak Gdk.Atom type;
- public weak int format;
- public weak uchar data;
- public weak int length;
+ public Gdk.Atom selection;
+ public Gdk.Atom target;
+ public Gdk.Atom type;
+ public int format;
+ public uchar data;
+ public int length;
public weak Gdk.Display display;
[NoArrayLength ()]
[InstanceByReference ()]
public struct StockItem {
public weak string stock_id;
public weak string label;
- public weak Gdk.ModifierType modifier;
- public weak uint keyval;
+ public Gdk.ModifierType modifier;
+ public uint keyval;
public weak string translation_domain;
[NoArrayLength ()]
public Gtk.StockItem copy ();
[ReferenceType ()]
public struct TableChild {
public weak Gtk.Widget widget;
- public weak ushort left_attach;
- public weak ushort right_attach;
- public weak ushort top_attach;
- public weak ushort bottom_attach;
- public weak ushort xpadding;
- public weak ushort ypadding;
- public weak uint xexpand;
- public weak uint yexpand;
- public weak uint xshrink;
- public weak uint yshrink;
- public weak uint xfill;
- public weak uint yfill;
+ public ushort left_attach;
+ public ushort right_attach;
+ public ushort top_attach;
+ public ushort bottom_attach;
+ public ushort xpadding;
+ public ushort ypadding;
+ public uint xexpand;
+ public uint yexpand;
+ public uint xshrink;
+ public uint yshrink;
+ public uint xfill;
+ public uint yfill;
}
[ReferenceType ()]
public struct TableRowCol {
- public weak ushort requisition;
- public weak ushort allocation;
- public weak ushort spacing;
- public weak uint need_expand;
- public weak uint need_shrink;
- public weak uint expand;
- public weak uint shrink;
- public weak uint empty;
+ public ushort requisition;
+ public ushort allocation;
+ public ushort spacing;
+ public uint need_expand;
+ public uint need_shrink;
+ public uint expand;
+ public uint shrink;
+ public uint empty;
}
[ReferenceType ()]
public struct TargetEntry {
public weak string target;
- public weak uint @flags;
- public weak uint info;
+ public uint @flags;
+ public uint info;
}
public struct TargetList {
public weak GLib.List list;
- public weak uint ref_count;
+ public uint ref_count;
[NoArrayLength ()]
[InstanceByReference ()]
public void add (Gdk.Atom target, uint @flags, uint info);
}
[ReferenceType ()]
public struct TargetPair {
- public weak Gdk.Atom target;
- public weak uint @flags;
- public weak uint info;
+ public Gdk.Atom target;
+ public uint @flags;
+ public uint info;
}
[ReferenceType ()]
public struct TextAppearance {
- public weak Gdk.Color bg_color;
- public weak Gdk.Color fg_color;
+ public Gdk.Color bg_color;
+ public Gdk.Color fg_color;
public weak Gdk.Bitmap bg_stipple;
public weak Gdk.Bitmap fg_stipple;
- public weak int rise;
- public weak uint underline;
- public weak uint strikethrough;
- public weak uint draw_bg;
- public weak uint inside_selection;
- public weak uint is_text;
+ public int rise;
+ public uint underline;
+ public uint strikethrough;
+ public uint draw_bg;
+ public uint inside_selection;
+ public uint is_text;
}
public struct TextAttributes {
public weak Gtk.TextAppearance appearance;
- public weak Gtk.Justification justification;
- public weak Gtk.TextDirection direction;
- public weak Pango.FontDescription font;
- public weak double font_scale;
- public weak int left_margin;
- public weak int indent;
- public weak int right_margin;
- public weak int pixels_above_lines;
- public weak int pixels_below_lines;
- public weak int pixels_inside_wrap;
- public weak Pango.TabArray tabs;
- public weak Gtk.WrapMode wrap_mode;
- public weak Pango.Language language;
- public weak uint invisible;
- public weak uint bg_full_height;
- public weak uint editable;
- public weak uint realized;
+ public Gtk.Justification justification;
+ public Gtk.TextDirection direction;
+ public Pango.FontDescription font;
+ public double font_scale;
+ public int left_margin;
+ public int indent;
+ public int right_margin;
+ public int pixels_above_lines;
+ public int pixels_below_lines;
+ public int pixels_inside_wrap;
+ public Pango.TabArray tabs;
+ public Gtk.WrapMode wrap_mode;
+ public Pango.Language language;
+ public uint invisible;
+ public uint bg_full_height;
+ public uint editable;
+ public uint realized;
[NoArrayLength ()]
[InstanceByReference ()]
public Gtk.TextAttributes copy ();
public weak string label;
public weak string accelerator;
public weak string tooltip;
- public weak GLib.Callback @callback;
- public weak bool is_active;
+ public GLib.Callback @callback;
+ public bool is_active;
}
[ReferenceType ()]
public struct TooltipsData {
public static Gtk.TooltipsData @get (Gtk.Widget widget);
}
public struct TreeIter {
- public weak int stamp;
- public weak pointer user_data;
- public weak pointer user_data2;
- public weak pointer user_data3;
+ public int stamp;
+ public pointer user_data;
+ public pointer user_data2;
+ public pointer user_data3;
[NoArrayLength ()]
[InstanceByReference ()]
public Gtk.TreeIter copy ();
}
[ReferenceType ()]
public struct WidgetAuxInfo {
- public weak int x;
- public weak int y;
- public weak int width;
- public weak int height;
- public weak uint x_set;
- public weak uint y_set;
+ public int x;
+ public int y;
+ public int width;
+ public int height;
+ public uint x_set;
+ public uint y_set;
}
[ReferenceType ()]
public struct WidgetShapeInfo {
- public weak short offset_x;
- public weak short offset_y;
+ public short offset_x;
+ public short offset_y;
public weak Gdk.Bitmap shape_mask;
}
[ReferenceType ()]
}
[CCode (cheader_filename = "gtk/gtk.h")]
namespace Gtk {
+ public struct Allocation {
+ public int x;
+ public int y;
+ public int width;
+ public int height;
+ }
public static void init (out string[] args);
public static void main ();
public static void main_quit ();
public bool xy_to_index (int x, int y, int index_, int trailing);
}
public class Renderer : GLib.Object {
- public weak Pango.Matrix matrix;
+ public Pango.Matrix matrix;
[NoArrayLength ()]
public void activate ();
[NoArrayLength ()]
public weak Pango.EngineShape shape_engine;
public weak Pango.EngineLang lang_engine;
public weak Pango.Font font;
- public weak uchar level;
- public weak Pango.Language language;
+ public uchar level;
+ public Pango.Language language;
public weak GLib.SList extra_attrs;
}
[ReferenceType ()]
public struct AttrClass {
- public weak Pango.AttrType type;
+ public Pango.AttrType type;
}
[ReferenceType ()]
public struct AttrColor {
public weak Pango.Attribute attr;
- public weak Pango.Color color;
+ public Pango.Color color;
}
[ReferenceType ()]
public struct AttrFloat {
public weak Pango.Attribute attr;
- public weak double value;
+ public double value;
}
[ReferenceType ()]
public struct AttrFontDesc {
public weak Pango.Attribute attr;
- public weak Pango.FontDescription desc;
+ public Pango.FontDescription desc;
[NoArrayLength ()]
public construct (Pango.FontDescription desc);
}
[ReferenceType ()]
public struct AttrInt {
public weak Pango.Attribute attr;
- public weak int value;
+ public int value;
}
[ReferenceType ()]
public struct AttrIterator {
[ReferenceType ()]
public struct AttrLanguage {
public weak Pango.Attribute attr;
- public weak Pango.Language value;
+ public Pango.Language value;
[NoArrayLength ()]
public construct (Pango.Language language);
}
public weak Pango.Attribute attr;
public weak Pango.Rectangle ink_rect;
public weak Pango.Rectangle logical_rect;
- public weak pointer data;
- public weak Pango.AttrDataCopyFunc copy_func;
- public weak GLib.DestroyNotify destroy_func;
+ public pointer data;
+ public Pango.AttrDataCopyFunc copy_func;
+ public GLib.DestroyNotify destroy_func;
[NoArrayLength ()]
public construct (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect);
[NoArrayLength ()]
[ReferenceType ()]
public struct AttrSize {
public weak Pango.Attribute attr;
- public weak int size;
- public weak uint absolute;
+ public int size;
+ public uint absolute;
[NoArrayLength ()]
public construct (int size);
}
}
[ReferenceType ()]
public struct Attribute {
- public weak pointer klass;
- public weak uint start_index;
- public weak uint end_index;
+ public pointer klass;
+ public uint start_index;
+ public uint end_index;
[NoArrayLength ()]
public Pango.Attribute copy ();
[NoArrayLength ()]
public bool equal (Pango.Attribute attr2);
}
public struct Color {
- public weak ushort red;
- public weak ushort green;
- public weak ushort blue;
+ public ushort red;
+ public ushort green;
+ public ushort blue;
[NoArrayLength ()]
[InstanceByReference ()]
public Pango.Color copy ();
}
[ReferenceType ()]
public struct GlyphGeometry {
- public weak int width;
- public weak int x_offset;
- public weak int y_offset;
+ public int width;
+ public int x_offset;
+ public int y_offset;
}
[ReferenceType ()]
public struct GlyphInfo {
- public weak uint glyph;
+ public uint glyph;
public weak Pango.GlyphGeometry geometry;
public weak Pango.GlyphVisAttr attr;
}
[ReferenceType ()]
public struct GlyphItem {
- public weak Pango.Item item;
- public weak Pango.GlyphString glyphs;
+ public Pango.Item item;
+ public Pango.GlyphString glyphs;
[NoArrayLength ()]
public GLib.SList apply_attrs (string text, Pango.AttrList list);
[NoArrayLength ()]
public Pango.GlyphItem split (string text, int split_index);
}
public struct GlyphString {
- public weak int num_glyphs;
+ public int num_glyphs;
public weak Pango.GlyphInfo glyphs;
- public weak int log_clusters;
+ public int log_clusters;
[NoArrayLength ()]
[InstanceByReference ()]
public Pango.GlyphString copy ();
}
[ReferenceType ()]
public struct GlyphVisAttr {
- public weak uint is_cluster_start;
+ public uint is_cluster_start;
}
public struct Item {
- public weak int offset;
- public weak int length;
- public weak int num_chars;
+ public int offset;
+ public int length;
+ public int num_chars;
public weak Pango.Analysis analysis;
[NoArrayLength ()]
[InstanceByReference ()]
}
public struct LayoutLine {
public weak Pango.Layout layout;
- public weak int start_index;
- public weak int length;
+ public int start_index;
+ public int length;
public weak GLib.SList runs;
- public weak uint is_paragraph_start;
- public weak uint resolved_dir;
+ public uint is_paragraph_start;
+ public uint resolved_dir;
[NoArrayLength ()]
[InstanceByReference ()]
public void get_extents (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect);
}
[ReferenceType ()]
public struct LayoutRun {
- public weak Pango.Item item;
- public weak Pango.GlyphString glyphs;
+ public Pango.Item item;
+ public Pango.GlyphString glyphs;
}
[ReferenceType ()]
public struct LogAttr {
- public weak uint is_line_break;
- public weak uint is_mandatory_break;
- public weak uint is_char_break;
- public weak uint is_white;
- public weak uint is_cursor_position;
- public weak uint is_word_start;
- public weak uint is_word_end;
- public weak uint is_sentence_boundary;
- public weak uint is_sentence_start;
- public weak uint is_sentence_end;
- public weak uint backspace_deletes_character;
+ public uint is_line_break;
+ public uint is_mandatory_break;
+ public uint is_char_break;
+ public uint is_white;
+ public uint is_cursor_position;
+ public uint is_word_start;
+ public uint is_word_end;
+ public uint is_sentence_boundary;
+ public uint is_sentence_start;
+ public uint is_sentence_end;
+ public uint backspace_deletes_character;
}
public struct Matrix {
- public weak double xx;
- public weak double xy;
- public weak double yx;
- public weak double yy;
- public weak double x0;
- public weak double y0;
+ public double xx;
+ public double xy;
+ public double yx;
+ public double yy;
+ public double x0;
+ public double y0;
[NoArrayLength ()]
[InstanceByReference ()]
public void concat (Pango.Matrix new_matrix);
}
[ReferenceType ()]
public struct Rectangle {
- public weak int x;
- public weak int y;
- public weak int width;
- public weak int height;
+ public int x;
+ public int y;
+ public int width;
+ public int height;
}
[ReferenceType ()]
public struct ScriptIter {