diff options
| author | Jonathan Blandford <jrb@redhat.com> | 2001-06-30 02:38:17 +0000 |
|---|---|---|
| committer | Jonathan Blandford <jrb@src.gnome.org> | 2001-06-30 02:38:17 +0000 |
| commit | ee5ff7ddc23a90018b35102ac87e6ac41928da10 (patch) | |
| tree | 4fc92ac89e40d45262882177cffc21521c50651c /gtk/gtkcellrenderer.h | |
| parent | 49c1e6dc8969a06d5b016700f3a64e31d082b7e3 (diff) | |
| download | gtk+-ee5ff7ddc23a90018b35102ac87e6ac41928da10.tar.gz | |
changed new_with_types to just plain new, fixing the number of columns,
Fri Jun 29 22:13:28 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreestore.c (gtk_tree_store_new): changed new_with_types
to just plain new, fixing the number of columns, and column types
at creation time.
* gtk/gtkliststore.c (gtk_list_store_new): ditto.
* gtk/gtkcellrenderertext.c
(gtk_cell_renderer_text_set_fixed_height_from_font): FIX the
height to a specific font.
* gtk/gtktreeview.c (gtk_tree_view_is_expander_column): fix brokenness.
* tests/*c: change to work with new store models.
Diffstat (limited to 'gtk/gtkcellrenderer.h')
| -rw-r--r-- | gtk/gtkcellrenderer.h | 60 |
1 files changed, 35 insertions, 25 deletions
diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h index 7084ba0c54..10729290f2 100644 --- a/gtk/gtkcellrenderer.h +++ b/gtk/gtkcellrenderer.h @@ -51,14 +51,17 @@ struct _GtkCellRenderer { GtkObject parent; - gboolean can_activate; - gboolean visible; - gfloat xalign; gfloat yalign; + gint width; + gint height; + guint16 xpad; guint16 ypad; + + guint can_activate : 1; + guint visible : 1; }; struct _GtkCellRendererClass @@ -91,28 +94,35 @@ struct _GtkCellRendererClass GtkCellRendererState flags); }; -GtkType gtk_cell_renderer_get_type (void); -void gtk_cell_renderer_get_size (GtkCellRenderer *cell, - GtkWidget *widget, - GdkRectangle *cell_area, - gint *x_offset, - gint *y_offset, - gint *width, - gint *height); -void gtk_cell_renderer_render (GtkCellRenderer *cell, - GdkWindow *window, - GtkWidget *widget, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GdkRectangle *expose_area, - GtkCellRendererState flags); -gboolean gtk_cell_renderer_event (GtkCellRenderer *cell, - GdkEvent *event, - GtkWidget *widget, - gchar *path, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GtkCellRendererState flags); +GtkType gtk_cell_renderer_get_type (void); +void gtk_cell_renderer_get_size (GtkCellRenderer *cell, + GtkWidget *widget, + GdkRectangle *cell_area, + gint *x_offset, + gint *y_offset, + gint *width, + gint *height); +void gtk_cell_renderer_render (GtkCellRenderer *cell, + GdkWindow *window, + GtkWidget *widget, + GdkRectangle *background_area, + GdkRectangle *cell_area, + GdkRectangle *expose_area, + GtkCellRendererState flags); +gboolean gtk_cell_renderer_event (GtkCellRenderer *cell, + GdkEvent *event, + GtkWidget *widget, + gchar *path, + GdkRectangle *background_area, + GdkRectangle *cell_area, + GtkCellRendererState flags); +void gtk_cell_renderer_set_fixed_size (GtkCellRenderer *cell, + gint width, + gint height); +void gtk_cell_renderer_get_fixed_size (GtkCellRenderer *cell, + gint *width, + gint *height); + #ifdef __cplusplus } |