callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed attribute handling from class vfuncs of GtkCellArea.

Browse Source 
Now GtkCellArea handles attribute connections in the base class,
subclasses only need to add/remove the renderers, render them,
do geometry and handle events.
This commit is contained in:
Tristan Van Berkom
2010-10-24 19:20:10 +09:00
parent 0e3179b669
commit 0722fbe7c8
3 changed files with 236 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
gtk/gtkcellarea.h
View File

@ -45,7 +45,6 @@ typedef struct _GtkCellArea GtkCellArea;
typedef struct _GtkCellAreaClass GtkCellAreaClass;
typedef struct _GtkCellAreaPrivate GtkCellAreaPrivate;
/**
* GtkCellCallback:
* @renderer: the cell renderer to operate on
@ -58,23 +57,6 @@ typedef void (*GtkCellCallback) (GtkCellRenderer *renderer,
gpointer data);
/**
* GtkCellAttributeCallback:
* @renderer: the #GtkCellRenderer that has an attribute
* @attribute: the property attributed to @id
* @id: the identifier of this attributed value
* @data: user-supplied data
*
* The type of the callback functions used for iterating over the
* attributes of the cell renderers in a #GtkCellArea,
* see gtk_cell_area_attribute_forall().
*/
typedef void (*GtkCellAttributeCallback) (GtkCellRenderer *renderer,
const gchar *attribute,
gint id,
gpointer data);
struct _GtkCellArea
{
GInitiallyUnowned parent_instance;
@ -105,20 +87,6 @@ struct _GtkCellAreaClass
GtkWidget *widget,
const GdkRectangle *cell_area);
/* Attributes */
void (* attribute_connect) (GtkCellArea *area,
GtkCellRenderer *renderer,
const gchar *attribute,
gint id);
void (* attribute_disconnect) (GtkCellArea *area,
GtkCellRenderer *renderer,
const gchar *attribute,
gint id);
void (* attribute_forall) (GtkCellArea *area,
GtkCellRenderer *renderer,
GtkCellAttributeCallback callback,
gpointer user_data);
/* Geometry */
GtkSizeRequestMode (* get_request_mode) (GtkCellArea *area);
void (* get_preferred_width) (GtkCellArea *area,
@ -171,20 +139,6 @@ void gtk_cell_area_render (GtkCellArea
GtkWidget *widget,
const GdkRectangle *cell_area);
/* Attributes */
void gtk_cell_area_attribute_connect (GtkCellArea *area,
GtkCellRenderer *renderer,
const gchar *attribute,
gint id);
void gtk_cell_area_attribute_disconnect (GtkCellArea *area,
GtkCellRenderer *renderer,
const gchar *attribute,
gint id);
void gtk_cell_area_attribute_forall (GtkCellArea *area,
GtkCellRenderer *renderer,
GtkCellAttributeCallback callback,
gpointer user_data);
/* Geometry */
GtkSizeRequestMode gtk_cell_area_get_request_mode (GtkCellArea *area);
void gtk_cell_area_get_preferred_width (GtkCellArea *area,
@ -211,6 +165,13 @@ void gtk_cell_area_get_preferred_width_for_height (GtkCellArea
void gtk_cell_area_apply_attributes (GtkCellArea *area,
GtkTreeModel *tree_model,
GtkTreeIter *iter);
void gtk_cell_area_attribute_connect (GtkCellArea *area,
GtkCellRenderer *renderer,
const gchar *attribute,
gint column);
void gtk_cell_area_attribute_disconnect (GtkCellArea *area,
GtkCellRenderer *renderer,
const gchar *attribute);
G_END_DECLS