diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-12-04 20:52:03 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-12-04 20:52:03 +0900 |
| commit | b0f849eafd6c56a052a1ea8930bcff3bb0cfbc15 (patch) | |
| tree | 40678edd3b79b09deec9c5a5e58e5c4ab69a7441 | |
| parent | 9c7e00f744e571393a25bb0a939b6df16507ed17 (diff) | |
| download | gtk+-b0f849eafd6c56a052a1ea8930bcff3bb0cfbc15.tar.gz | |
Changed GTK_CELL_AREA_WARN_INVALID_CHILD_PROPERTY_ID for GTK_CELL_AREA_WARN_INVALID_CELL_PROPERTY_ID
| -rw-r--r-- | docs/reference/gtk/gtk3-sections.txt | 2 | ||||
| -rw-r--r-- | gtk/gtkcellarea.h | 17 | ||||
| -rw-r--r-- | gtk/gtkcellareabox.c | 4 |
3 files changed, 16 insertions, 7 deletions
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt index 589641bb91..8104875f3d 100644 --- a/docs/reference/gtk/gtk3-sections.txt +++ b/docs/reference/gtk/gtk3-sections.txt @@ -4386,6 +4386,7 @@ gtk_cell_layout_get_type GtkCellArea GtkCellAreaClass GtkCellCallback +GTK_CELL_AREA_WARN_INVALID_CELL_PROPERTY_ID gtk_cell_area_add gtk_cell_area_remove gtk_cell_area_has_renderer @@ -4415,7 +4416,6 @@ gtk_cell_area_cell_set_valist gtk_cell_area_cell_get_valist gtk_cell_area_cell_set_property gtk_cell_area_cell_get_property -GTK_CELL_AREA_WARN_INVALID_CHILD_PROPERTY_ID gtk_cell_area_is_activatable gtk_cell_area_activate gtk_cell_area_focus diff --git a/gtk/gtkcellarea.h b/gtk/gtkcellarea.h index 874a863c2b..cf396c638a 100644 --- a/gtk/gtkcellarea.h +++ b/gtk/gtkcellarea.h @@ -47,6 +47,19 @@ typedef struct _GtkCellAreaPrivate GtkCellAreaPrivate; typedef struct _GtkCellAreaContext GtkCellAreaContext; /** + * GTK_CELL_AREA_WARN_INVALID_CELL_PROPERTY_ID: + * @object: the #GObject on which set_cell_property() or get_get_property() + * was called + * @property_id: the numeric id of the property + * @pspec: the #GParamSpec of the property + * + * This macro should be used to emit a standard warning about unexpected + * properties in set_cell_property() and get_cell_property() implementations. + */ +#define GTK_CELL_AREA_WARN_INVALID_CELL_PROPERTY_ID(object, property_id, pspec) \ + G_OBJECT_WARN_INVALID_PSPEC ((object), "cell property id", (property_id), (pspec)) + +/** * GtkCellCallback: * @renderer: the cell renderer to operate on * @data: user-supplied data @@ -341,10 +354,6 @@ void gtk_cell_area_cell_get_property (GtkCellArea const gchar *property_name, GValue *value); -#define GTK_CELL_AREA_WARN_INVALID_CHILD_PROPERTY_ID(object, property_id, pspec) \ - G_OBJECT_WARN_INVALID_PSPEC ((object), "cell property id", (property_id), (pspec)) - - /* Focus */ gboolean gtk_cell_area_is_activatable (GtkCellArea *area); gboolean gtk_cell_area_activate (GtkCellArea *area, diff --git a/gtk/gtkcellareabox.c b/gtk/gtkcellareabox.c index d51e11ac65..e24119a75a 100644 --- a/gtk/gtkcellareabox.c +++ b/gtk/gtkcellareabox.c @@ -1401,7 +1401,7 @@ gtk_cell_area_box_set_cell_property (GtkCellArea *area, } break; default: - GTK_CELL_AREA_WARN_INVALID_CHILD_PROPERTY_ID (area, prop_id, pspec); + GTK_CELL_AREA_WARN_INVALID_CELL_PROPERTY_ID (area, prop_id, pspec); break; } @@ -1443,7 +1443,7 @@ gtk_cell_area_box_get_cell_property (GtkCellArea *area, g_value_set_enum (value, info->pack); break; default: - GTK_CELL_AREA_WARN_INVALID_CHILD_PROPERTY_ID (area, prop_id, pspec); + GTK_CELL_AREA_WARN_INVALID_CELL_PROPERTY_ID (area, prop_id, pspec); break; } } |