Shuffle some layout so that gapi2-parser can understand everything

This commit is contained in:
Iain Holmes 2006-06-23 15:13:11 +00:00
parent c43da5a4bd
commit 5a01d0ab1c
7 changed files with 40 additions and 46 deletions

View File

@ -1,3 +1,13 @@
2006-06-23 Iain Holmes <iain@openedhand.com>
* clutter/clutter-label.h:
* clutter/clutter-group.h:
* clutter/clutter-rectangle.h:
* clutter/clutter-video-texture.h:
* clutter/clutter-event.h:
* clutter/clutter-texture.h: Fix the header layout so that C# parser
can understand everything.
2006-06-23 Ross Burton <ross@openedhand.com>
* configure.ac:

View File

@ -117,26 +117,19 @@ ClutterEvent *clutter_event_new (ClutterEventType type);
ClutterEvent *clutter_event_copy (ClutterEvent *event);
void clutter_event_free (ClutterEvent *event);
ClutterEventType
clutter_key_event_type (ClutterKeyEvent *keyev);
ClutterEventType clutter_key_event_type (ClutterKeyEvent *keyev);
guint32
clutter_key_event_time (ClutterKeyEvent *keyev);
guint32 clutter_key_event_time (ClutterKeyEvent *keyev);
guint
clutter_key_event_state (ClutterKeyEvent *keyev);
guint clutter_key_event_state (ClutterKeyEvent *keyev);
guint
clutter_key_event_symbol (ClutterKeyEvent *keyev);
guint clutter_key_event_symbol (ClutterKeyEvent *keyev);
guint16
clutter_key_event_code (ClutterKeyEvent *keyev);
guint16 clutter_key_event_code (ClutterKeyEvent *keyev);
guint32
clutter_key_event_unicode (ClutterKeyEvent *keyev);
guint32 clutter_key_event_unicode (ClutterKeyEvent *keyev);
guint32
clutter_keysym_to_unicode (guint keyval);
guint32 clutter_keysym_to_unicode (guint keyval);
G_END_DECLS

View File

@ -53,9 +53,9 @@ G_BEGIN_DECLS
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
CLUTTER_TYPE_GROUP, ClutterGroupClass))
typedef struct _ClutterGroupPrivate ClutterGroupPrivate;
typedef struct _ClutterGroup ClutterGroup;
typedef struct _ClutterGroupClass ClutterGroupClass;
typedef struct _ClutterGroupPrivate ClutterGroupPrivate;
struct _ClutterGroup
{

View File

@ -56,8 +56,8 @@ G_BEGIN_DECLS
CLUTTER_TYPE_LABEL, ClutterLabelClass))
typedef struct _ClutterLabel ClutterLabel;
typedef struct _ClutterLabelPrivate ClutterLabelPrivate ;
typedef struct _ClutterLabelClass ClutterLabelClass;
typedef struct _ClutterLabelPrivate ClutterLabelPrivate;
struct _ClutterLabel
{

View File

@ -54,9 +54,9 @@ G_BEGIN_DECLS
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
CLUTTER_TYPE_RECTANGLE, ClutterRectangleClass))
typedef struct _ClutterRectanglePrivate ClutterRectanglePrivate;
typedef struct _ClutterRectangle ClutterRectangle;
typedef struct _ClutterRectangleClass ClutterRectangleClass;
typedef struct _ClutterRectanglePrivate ClutterRectanglePrivate;
struct _ClutterRectangle
{

View File

@ -54,73 +54,64 @@ G_BEGIN_DECLS
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
CLUTTER_TYPE_TEXTURE, ClutterTextureClass))
typedef struct ClutterTexturePrivate ClutterTexturePrivate ;
typedef struct _ClutterTexture ClutterTexture;
typedef struct _ClutterTextureClass ClutterTextureClass;
typedef struct ClutterTexturePrivate ClutterTexturePrivate;
struct _ClutterTexture
{
ClutterActor parent;
ClutterTexturePrivate *priv;
};
};
struct _ClutterTextureClass
struct _ClutterTextureClass
{
ClutterActorClass parent_class;
void (*size_change) (ClutterTexture *texture, gint width, gint height);
void (*pixbuf_change) (ClutterTexture *texture );
};
void (*size_change) (ClutterTexture *texture,
gint width,
gint height);
void (*pixbuf_change) (ClutterTexture *texture);
};
GType clutter_texture_get_type (void);
ClutterActor*
clutter_texture_new_from_pixbuf (GdkPixbuf *pixbuf);
ClutterActor *clutter_texture_new_from_pixbuf (GdkPixbuf *pixbuf);
ClutterActor*
clutter_texture_new (void);
ClutterActor *clutter_texture_new (void);
void
clutter_texture_set_pixbuf (ClutterTexture *texture, GdkPixbuf *pixbuf);
void clutter_texture_set_pixbuf (ClutterTexture *texture, GdkPixbuf *pixbuf);
GdkPixbuf*
clutter_texture_get_pixbuf (ClutterTexture* texture);
GdkPixbuf *clutter_texture_get_pixbuf (ClutterTexture* texture);
void
clutter_texture_get_base_size (ClutterTexture *texture,
voidclutter_texture_get_base_size (ClutterTexture *texture,
gint *width,
gint *height);
/* Below mainly for subclassed texture based actors */
void
clutter_texture_bind_tile (ClutterTexture *texture, gint index);
void clutter_texture_bind_tile (ClutterTexture *texture, gint index);
void
clutter_texture_get_n_tiles (ClutterTexture *texture,
void clutter_texture_get_n_tiles (ClutterTexture *texture,
gint *n_x_tiles,
gint *n_y_tiles);
void
clutter_texture_get_x_tile_detail (ClutterTexture *texture,
void clutter_texture_get_x_tile_detail (ClutterTexture *texture,
gint x_index,
gint *pos,
gint *size,
gint *waste);
void
clutter_texture_get_y_tile_detail (ClutterTexture *texture,
void clutter_texture_get_y_tile_detail (ClutterTexture *texture,
gint y_index,
gint *pos,
gint *size,
gint *waste);
gboolean
clutter_texture_has_generated_tiles (ClutterTexture *texture);
gboolean clutter_texture_has_generated_tiles (ClutterTexture *texture);
gboolean
clutter_texture_is_tiled (ClutterTexture *texture);
gboolean clutter_texture_is_tiled (ClutterTexture *texture);
G_END_DECLS

View File

@ -56,9 +56,9 @@ G_BEGIN_DECLS
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
CLUTTER_TYPE_VIDEO_TEXTURE, ClutterVideoTextureClass))
typedef struct ClutterVideoTexturePrivate ClutterVideoTexturePrivate ;
typedef struct _ClutterVideoTexture ClutterVideoTexture;
typedef struct _ClutterVideoTextureClass ClutterVideoTextureClass;
typedef struct ClutterVideoTexturePrivate ClutterVideoTexturePrivate;
/* #define CLUTTER_VIDEO_TEXTURE_ERROR clutter_video_texture_error_quark() */