diff options
author | Havoc Pennington <hp@redhat.com> | 2001-01-01 19:01:54 +0000 |
---|---|---|
committer | Havoc Pennington <hp@src.gnome.org> | 2001-01-01 19:01:54 +0000 |
commit | 66f87948e233899c8bb67979df74a9e728b7635c (patch) | |
tree | 19cd6883960c3c95160e0b5a21cfacab38fa5fbf /gtk/gtkcellrenderer.c | |
parent | e5d534b3fd7fe105f21dcbadcec8c6bce01ca0da (diff) | |
download | gtk+-66f87948e233899c8bb67979df74a9e728b7635c.tar.gz |
Adapt to GtkTreeSelection changes
2001-01-01 Havoc Pennington <hp@redhat.com>
* gtk/gtktreeview.c: Adapt to GtkTreeSelection changes
* gtk/gtktreeselection.c (_gtk_tree_selection_set_tree_view):
don't fill in tree_view->priv->selection, kind of an unexpected
side effect
* gtk/gtkcellrenderertext.c: Remove definition of _ and include
gtkintl.h
* gtk/gtkcellrenderer.c: Remove definition of _ and include
gtkintl.h
(gtk_cell_renderer_get_property): remove calls to g_value_init
* gtk/gtkcellrendererpixbuf.c: Remove definition of _ and include
gtkintl.h
* gtk/gtkcellrenderertextpixbuf.c: Remove definition of _ macro
and include gtkintl.h
(gtk_cell_renderer_text_pixbuf_class_init): remove spaces from
property names
* gtk/gtktreeselection.c (_gtk_tree_selection_new): rename, return
GtkTreeSelection
(_gtk_tree_selection_new_from_with_view): rename, return
GtkTreeSelection
(_gtk_tree_selection_set_tree_view): rename with uscore
(gtk_tree_selection_get_selected): fill in the "model" out param
first, so it gets filled in even if we return at the top of the
function
(gtk_tree_selection_real_select_all): add a comment and an else{}
to clarify this a bit
(gtk_tree_selection_real_unselect_all): add the same else{}
* gtk/gtktreeselection.h: Rename new, new_with_tree_view, and
set_tree_view to have underscore prefixes, move them to the
private header, fix return type of new_with_tree_view
(struct _GtkTreeSelection): mark struct
fields private
* gtk/gtktreemodel.c (gtk_tree_model_get_flags): return
GtkTreeModelFlags, not a guint
(gtk_tree_path_prev): return gboolean not gint
(gtk_tree_path_up): return gboolean not gint
* gtk/gtktreemodel.h (struct _GtkTreeModelIface): make get_flags
return GtkTreeModelFlags, not a guint
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_finalize): check
that child model is non-null before unrefing it
(g_value_int_compare_func): make this a qsort compare func, not
a boolean predicate
* gtk/gtktreemodelsort.h: rename gtk_tree_model_set_sort_column,
(add -umn to the end), and mark it unimplemented
(gtk_tree_model_sort_resort): remove, this wasn't implemented, and
I don't see what it's for - doesn't the model always sort itself?
(gtk_tree_model_sort_set_compare): this had the wrong signature
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_set_attributes):
Fix the docs to say that it destructively replaces existing
attributes (previously said that it added attributes).
(gtk_tree_view_column_set_visible): canonicalize bool before
equality testing. Also, check for realization before
hiding/showing the tree_column->window; if this window could exist
before realization, then it's busted and needs fixing, we can't
create GDK resources pre-realization. Also, remove
superfluous queue_resize(), since set_size() does that for us.
(gtk_tree_view_column_set_col_type): check realization before
using tree_column->window
* gtk/gtktreedatalist.c: fix filename in copyright notice
Diffstat (limited to 'gtk/gtkcellrenderer.c')
-rw-r--r-- | gtk/gtkcellrenderer.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c index adb255e672..c9d607874e 100644 --- a/gtk/gtkcellrenderer.c +++ b/gtk/gtkcellrenderer.c @@ -18,10 +18,7 @@ */ #include "gtkcellrenderer.h" - -#ifndef _ -#define _(x) x -#endif +#include "gtkintl.h" static void gtk_cell_renderer_init (GtkCellRenderer *cell); static void gtk_cell_renderer_class_init (GtkCellRendererClass *class); @@ -150,19 +147,15 @@ gtk_cell_renderer_get_property (GObject *object, switch (param_id) { case PROP_XALIGN: - g_value_init (value, G_TYPE_FLOAT); g_value_set_float (value, cell->xalign); break; case PROP_YALIGN: - g_value_init (value, G_TYPE_FLOAT); g_value_set_float (value, cell->yalign); break; case PROP_XPAD: - g_value_init (value, G_TYPE_INT); g_value_set_float (value, cell->xpad); break; case PROP_YPAD: - g_value_init (value, G_TYPE_INT); g_value_set_float (value, cell->ypad); break; default: @@ -208,7 +201,8 @@ gtk_cell_renderer_get_size (GtkCellRenderer *cell, gint *height) { /* It's actually okay to pass in a NULL cell, as we run into that - * a lot */ + * a lot + */ if (cell == NULL) return; g_return_if_fail (GTK_IS_CELL_RENDERER (cell)); @@ -227,7 +221,8 @@ gtk_cell_renderer_render (GtkCellRenderer *cell, guint flags) { /* It's actually okay to pass in a NULL cell, as we run into that - * a lot */ + * a lot + */ if (cell == NULL) return; g_return_if_fail (GTK_IS_CELL_RENDERER (cell)); @@ -252,7 +247,8 @@ gtk_cell_renderer_event (GtkCellRenderer *cell, guint flags) { /* It's actually okay to pass in a NULL cell, as we run into that - * a lot */ + * a lot + */ if (cell == NULL) return FALSE; g_return_val_if_fail (GTK_IS_CELL_RENDERER (cell), FALSE); |