#include <gdk/gdkkeysyms.h>
#include "gtkcmctree.h"
#include "claws-marshal.h"
+#include "utils.h"
#define PM_SIZE 8
#define TAB_SIZE (PM_SIZE + 6)
static void ctree_detach_styles (GtkCMCTree *ctree,
GtkCMCTreeNode *node,
gpointer data);
-static gint draw_cell_pixmap (GdkWindow *window,
+static gint draw_cell_pixbuf (GdkWindow *window,
GdkRectangle *clip_rectangle,
GdkGC *fg_gc,
- GdkPixmap *pixmap,
- GdkBitmap *mask,
+ GdkPixbuf *pixbuf,
gint x,
gint y,
gint width,
GtkCMCellType type,
const gchar *text,
guint8 spacing,
- GdkPixmap *pixmap,
- GdkBitmap *mask);
+ GdkPixbuf *pixbuf);
static void set_node_info (GtkCMCTree *ctree,
GtkCMCTreeNode *node,
const gchar *text,
guint8 spacing,
- GdkPixmap *pixmap_closed,
- GdkBitmap *mask_closed,
- GdkPixmap *pixmap_opened,
- GdkBitmap *mask_opened,
+ GdkPixbuf *pixbuf_closed,
+ GdkPixbuf *pixbuf_opened,
gboolean is_leaf,
gboolean expanded);
static GtkCMCTreeRow *row_new (GtkCMCTree *ctree);
{
case ARG_N_COLUMNS: /* construct-only arg, only set at construction time */
#if !GLIB_CHECK_VERSION(2,10,0)
- g_return_if_fail (clist->row_mem_chunk == NULL);
+ cm_return_if_fail (clist->row_mem_chunk == NULL);
#endif
clist->columns = MAX (1, g_value_get_uint (value));
#if !GLIB_CHECK_VERSION(2,10,0)
GtkCMCTreeNode *child;
gint i;
- g_return_if_fail (GTK_IS_CMCTREE (widget));
+ cm_return_if_fail (GTK_IS_CMCTREE (widget));
GTK_WIDGET_CLASS (parent_class)->realize (widget);
GtkCMCTree *ctree;
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCTREE (widget));
+ cm_return_if_fail (GTK_IS_CMCTREE (widget));
GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
GtkCMCList *clist;
gint button_actions;
- g_return_val_if_fail (GTK_IS_CMCTREE (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (widget), FALSE);
+ cm_return_val_if_fail (event != NULL, FALSE);
ctree = GTK_CMCTREE (widget);
clist = GTK_CMCLIST (widget);
gint i;
gint y = 0;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
ctree = GTK_CMCTREE (clist);
}
static gint
-draw_cell_pixmap (GdkWindow *window,
+draw_cell_pixbuf (GdkWindow *window,
GdkRectangle *clip_rectangle,
GdkGC *fg_gc,
- GdkPixmap *pixmap,
- GdkBitmap *mask,
+ GdkPixbuf *pixbuf,
gint x,
gint y,
gint width,
gint xsrc = 0;
gint ysrc = 0;
- if (mask)
- {
- gdk_gc_set_clip_mask (fg_gc, mask);
- gdk_gc_set_clip_origin (fg_gc, x, y);
- }
+ gdk_gc_set_clip_origin (fg_gc, x, y);
if (x < clip_rectangle->x)
{
xsrc = clip_rectangle->x - x;
height = clip_rectangle->y + clip_rectangle->height - y;
if (width > 0 && height > 0)
- gdk_draw_drawable (window, fg_gc, pixmap, xsrc, ysrc, x, y, width, height);
+ gdk_draw_pixbuf (window, fg_gc, pixbuf, xsrc, ysrc, x, y, width, height, GDK_RGB_DITHER_NONE, 0, 0);
- if (mask)
- {
- gdk_gc_set_clip_rectangle (fg_gc, NULL);
- gdk_gc_set_clip_origin (fg_gc, 0, 0);
- }
+ gdk_gc_set_clip_origin (fg_gc, 0, 0);
return x + MAX (width, 0);
}
gint state;
gint i;
- g_return_if_fail (clist != NULL);
+ cm_return_if_fail (clist != NULL);
/* bail now if we arn't drawable yet */
if (!GTK_WIDGET_DRAWABLE (clist) || row < 0 || row >= clist->rows)
gint width;
gint height;
- gint pixmap_width;
+ gint pixbuf_width;
gint string_width;
gint old_offset;
cell_rectangle.height = clip_rectangle.height;
string_width = 0;
- pixmap_width = 0;
+ pixbuf_width = 0;
+ height = 0;
if (area && !gdk_rectangle_intersect (area, &cell_rectangle,
&intersect_rectangle))
switch (clist_row->cell[i].type)
{
- case GTK_CMCELL_PIXMAP:
- gdk_drawable_get_size
- (GTK_CMCELL_PIXMAP (clist_row->cell[i])->pixmap, &pixmap_width,
- &height);
- width += pixmap_width;
+ case GTK_CMCELL_PIXBUF:
+ pixbuf_width = gdk_pixbuf_get_width(GTK_CMCELL_PIXBUF (clist_row->cell[i])->pixbuf);
+ height = gdk_pixbuf_get_height(GTK_CMCELL_PIXBUF (clist_row->cell[i])->pixbuf);
+ width += pixbuf_width;
break;
case GTK_CMCELL_PIXTEXT:
- if (GTK_CMCELL_PIXTEXT (clist_row->cell[i])->pixmap)
+ if (GTK_CMCELL_PIXTEXT (clist_row->cell[i])->pixbuf)
{
- gdk_drawable_get_size
- (GTK_CMCELL_PIXTEXT (clist_row->cell[i])->pixmap,
- &pixmap_width, &height);
- width += pixmap_width;
+ pixbuf_width = gdk_pixbuf_get_width(GTK_CMCELL_PIXTEXT (clist_row->cell[i])->pixbuf);
+ height = gdk_pixbuf_get_height(GTK_CMCELL_PIXTEXT (clist_row->cell[i])->pixbuf);
+ width += pixbuf_width;
}
if (GTK_CMCELL_PIXTEXT (clist_row->cell[i])->text &&
- GTK_CMCELL_PIXTEXT (clist_row->cell[i])->pixmap)
+ GTK_CMCELL_PIXTEXT (clist_row->cell[i])->pixbuf)
width += GTK_CMCELL_PIXTEXT (clist_row->cell[i])->spacing;
if (i == ctree->tree_column)
offset += clist_row->cell[i].horizontal;
switch (clist_row->cell[i].type)
{
- case GTK_CMCELL_PIXMAP:
- draw_cell_pixmap
+ case GTK_CMCELL_PIXBUF:
+ draw_cell_pixbuf
(clist->clist_window, &clip_rectangle, fg_gc,
- GTK_CMCELL_PIXMAP (clist_row->cell[i])->pixmap,
- GTK_CMCELL_PIXMAP (clist_row->cell[i])->mask,
+ GTK_CMCELL_PIXBUF (clist_row->cell[i])->pixbuf,
offset,
clip_rectangle.y + clist_row->cell[i].vertical +
(clip_rectangle.height - height) / 2,
- pixmap_width, height);
+ pixbuf_width, height);
break;
case GTK_CMCELL_PIXTEXT:
- offset = draw_cell_pixmap
+ offset = draw_cell_pixbuf
(clist->clist_window, &clip_rectangle, fg_gc,
- GTK_CMCELL_PIXTEXT (clist_row->cell[i])->pixmap,
- GTK_CMCELL_PIXTEXT (clist_row->cell[i])->mask,
+ GTK_CMCELL_PIXTEXT (clist_row->cell[i])->pixbuf,
offset,
clip_rectangle.y + clist_row->cell[i].vertical +
(clip_rectangle.height - height) / 2,
- pixmap_width, height);
+ pixbuf_width, height);
offset += GTK_CMCELL_PIXTEXT (clist_row->cell[i])->spacing;
/* Fall through */
offset += ctree->tree_spacing;
if (clist->column[i].justification == GTK_JUSTIFY_RIGHT)
- offset -= (pixmap_width + clist_row->cell[i].horizontal);
+ offset -= (pixbuf_width + clist_row->cell[i].horizontal);
else
offset += clist_row->cell[i].horizontal;
old_offset = offset;
- offset = draw_cell_pixmap (clist->clist_window, &clip_rectangle, fg_gc,
- GTK_CMCELL_PIXTEXT (clist_row->cell[i])->pixmap,
- GTK_CMCELL_PIXTEXT (clist_row->cell[i])->mask,
+ offset = draw_cell_pixbuf (clist->clist_window, &clip_rectangle, fg_gc,
+ GTK_CMCELL_PIXTEXT (clist_row->cell[i])->pixbuf,
offset,
clip_rectangle.y + clist_row->cell[i].vertical
+ (clip_rectangle.height - height) / 2,
- pixmap_width, height);
+ pixbuf_width, height);
if (layout)
{
if (clist->column[i].justification == GTK_JUSTIFY_RIGHT)
{
offset = (old_offset - string_width);
- if (GTK_CMCELL_PIXTEXT (clist_row->cell[i])->pixmap)
+ if (GTK_CMCELL_PIXTEXT (clist_row->cell[i])->pixbuf)
offset -= GTK_CMCELL_PIXTEXT (clist_row->cell[i])->spacing;
}
else
{
- if (GTK_CMCELL_PIXTEXT (clist_row->cell[i])->pixmap)
+ if (GTK_CMCELL_PIXTEXT (clist_row->cell[i])->pixbuf)
offset += GTK_CMCELL_PIXTEXT (clist_row->cell[i])->spacing;
}
gint rows = 0;
if (sibling)
- g_return_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent);
- g_return_if_fail (node != NULL);
- g_return_if_fail (node != sibling);
- g_return_if_fail (node != parent);
+ cm_return_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent);
+ cm_return_if_fail (node != NULL);
+ cm_return_if_fail (node != sibling);
+ cm_return_if_fail (node != parent);
clist = GTK_CMCLIST (ctree);
GtkCMCTreeNode *parent;
GList *list;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
clist = GTK_CMCLIST (ctree);
GtkCMCTree *ctree;
GtkCMCTreeNode *node;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
if (GTK_CMCLIST_AUTO_SORT (clist))
return;
GtkCMCTreeNode *work;
gboolean visible = FALSE;
- g_return_if_fail (ctree != NULL);
- g_return_if_fail (node != NULL);
- g_return_if_fail (!new_sibling ||
+ cm_return_if_fail (ctree != NULL);
+ cm_return_if_fail (node != NULL);
+ cm_return_if_fail (!new_sibling ||
GTK_CMCTREE_ROW (new_sibling)->parent == new_parent);
if (new_parent && GTK_CMCTREE_ROW (new_parent)->is_leaf)
GtkCMCList *clist;
GtkCMCTreeNode *node;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
clist = GTK_CMCLIST (ctree);
GtkRequisition requisition;
gboolean visible;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
if (!node || GTK_CMCTREE_ROW (node)->expanded || GTK_CMCTREE_ROW (node)->is_leaf)
return;
GTK_CMCLIST_GET_CLASS (clist)->cell_size_request
(clist, >K_CMCTREE_ROW (node)->row, ctree->tree_column, &requisition);
- /* unref/unset closed pixmap */
+ /* unref/unset closed pixbuf */
if (GTK_CMCELL_PIXTEXT
- (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixmap)
+ (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf)
{
g_object_unref
(GTK_CMCELL_PIXTEXT
- (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixmap);
+ (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf);
GTK_CMCELL_PIXTEXT
- (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixmap = NULL;
-
- if (GTK_CMCELL_PIXTEXT
- (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->mask)
- {
- g_object_unref
- (GTK_CMCELL_PIXTEXT
- (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->mask);
- GTK_CMCELL_PIXTEXT
- (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->mask = NULL;
- }
+ (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf = NULL;
}
- /* set/ref opened pixmap */
- if (GTK_CMCTREE_ROW (node)->pixmap_opened)
+ /* set/ref opened pixbuf */
+ if (GTK_CMCTREE_ROW (node)->pixbuf_opened)
{
GTK_CMCELL_PIXTEXT
- (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixmap =
- g_object_ref (GTK_CMCTREE_ROW (node)->pixmap_opened);
-
- if (GTK_CMCTREE_ROW (node)->mask_opened)
- GTK_CMCELL_PIXTEXT
- (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->mask =
- g_object_ref (GTK_CMCTREE_ROW (node)->mask_opened);
+ (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf =
+ g_object_ref (GTK_CMCTREE_ROW (node)->pixbuf_opened);
}
list = (GList *)node;
list->next = (GList *)(GTK_CMCTREE_ROW (node)->children);
- if (visible)
+ if (visible && !GTK_CMCLIST_AUTO_RESIZE_BLOCKED (clist))
{
/* resize auto_resize columns if needed */
for (i = 0; i < clist->columns; i++)
gboolean visible;
gint level;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
if (!node || !GTK_CMCTREE_ROW (node)->expanded ||
GTK_CMCTREE_ROW (node)->is_leaf)
GTK_CMCLIST_GET_CLASS (clist)->cell_size_request
(clist, >K_CMCTREE_ROW (node)->row, ctree->tree_column, &requisition);
- /* unref/unset opened pixmap */
+ /* unref/unset opened pixbuf */
if (GTK_CMCELL_PIXTEXT
- (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixmap)
+ (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf)
{
g_object_unref
(GTK_CMCELL_PIXTEXT
- (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixmap);
+ (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf);
GTK_CMCELL_PIXTEXT
- (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixmap = NULL;
-
- if (GTK_CMCELL_PIXTEXT
- (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->mask)
- {
- g_object_unref
- (GTK_CMCELL_PIXTEXT
- (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->mask);
- GTK_CMCELL_PIXTEXT
- (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->mask = NULL;
- }
+ (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf = NULL;
}
- /* set/ref closed pixmap */
- if (GTK_CMCTREE_ROW (node)->pixmap_closed)
+ /* set/ref closed pixbuf */
+ if (GTK_CMCTREE_ROW (node)->pixbuf_closed)
{
GTK_CMCELL_PIXTEXT
- (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixmap =
- g_object_ref (GTK_CMCTREE_ROW (node)->pixmap_closed);
-
- if (GTK_CMCTREE_ROW (node)->mask_closed)
- GTK_CMCELL_PIXTEXT
- (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->mask =
- g_object_ref (GTK_CMCTREE_ROW (node)->mask_closed);
+ (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixbuf =
+ g_object_ref (GTK_CMCTREE_ROW (node)->pixbuf_closed);
}
work = GTK_CMCTREE_ROW (node)->children;
PangoLayout *layout;
PangoRectangle logical_rect;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
- g_return_if_fail (requisition != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (requisition != NULL);
ctree = GTK_CMCTREE (clist);
switch (clist_row->cell[column].type)
{
case GTK_CMCELL_PIXTEXT:
- if (GTK_CMCELL_PIXTEXT (clist_row->cell[column])->pixmap)
+ if (GTK_CMCELL_PIXTEXT (clist_row->cell[column])->pixbuf)
{
- gdk_drawable_get_size (GTK_CMCELL_PIXTEXT
- (clist_row->cell[column])->pixmap,
- &width, &height);
+ width = gdk_pixbuf_get_width(GTK_CMCELL_PIXTEXT (clist_row->cell[column])->pixbuf);
+ height = gdk_pixbuf_get_height(GTK_CMCELL_PIXTEXT (clist_row->cell[column])->pixbuf);
width += GTK_CMCELL_PIXTEXT (clist_row->cell[column])->spacing;
}
else
requisition->width += 3;
}
break;
- case GTK_CMCELL_PIXMAP:
- gdk_drawable_get_size (GTK_CMCELL_PIXMAP (clist_row->cell[column])->pixmap,
- &width, &height);
+ case GTK_CMCELL_PIXBUF:
+ width = gdk_pixbuf_get_width(GTK_CMCELL_PIXBUF (clist_row->cell[column])->pixbuf);
+ height = gdk_pixbuf_get_height(GTK_CMCELL_PIXBUF (clist_row->cell[column])->pixbuf);
requisition->width += width;
requisition->height = MAX (requisition->height, height);
break;
GtkCMCellType type,
const gchar *text,
guint8 spacing,
- GdkPixmap *pixmap,
- GdkBitmap *mask)
+ GdkPixbuf *pixbuf)
{
gboolean visible = FALSE;
GtkCMCTree *ctree;
GtkRequisition requisition;
gchar *old_text = NULL;
- GdkPixmap *old_pixmap = NULL;
- GdkBitmap *old_mask = NULL;
+ GdkPixbuf *old_pixbuf = NULL;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
- g_return_if_fail (clist_row != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (clist_row != NULL);
ctree = GTK_CMCTREE (clist);
GtkCMCTreeNode *parent;
parent = ((GtkCMCTreeRow *)clist_row)->parent;
- if (!parent || (parent && GTK_CMCTREE_ROW (parent)->expanded &&
+ if ((parent && GTK_CMCTREE_ROW (parent)->expanded &&
gtk_cmctree_is_viewable (ctree, parent)))
{
visible = TRUE;
case GTK_CMCELL_TEXT:
old_text = GTK_CMCELL_TEXT (clist_row->cell[column])->text;
break;
- case GTK_CMCELL_PIXMAP:
- old_pixmap = GTK_CMCELL_PIXMAP (clist_row->cell[column])->pixmap;
- old_mask = GTK_CMCELL_PIXMAP (clist_row->cell[column])->mask;
+ case GTK_CMCELL_PIXBUF:
+ old_pixbuf = GTK_CMCELL_PIXBUF (clist_row->cell[column])->pixbuf;
break;
case GTK_CMCELL_PIXTEXT:
old_text = GTK_CMCELL_PIXTEXT (clist_row->cell[column])->text;
- old_pixmap = GTK_CMCELL_PIXTEXT (clist_row->cell[column])->pixmap;
- old_mask = GTK_CMCELL_PIXTEXT (clist_row->cell[column])->mask;
+ old_pixbuf = GTK_CMCELL_PIXTEXT (clist_row->cell[column])->pixbuf;
break;
case GTK_CMCELL_WIDGET:
/* unimplemented */
if (column == ctree->tree_column && type != GTK_CMCELL_EMPTY)
type = GTK_CMCELL_PIXTEXT;
- /* Note that pixmap and mask were already ref'ed by the caller
+ /* Note that pixbuf and mask were already ref'ed by the caller
*/
switch (type)
{
GTK_CMCELL_TEXT (clist_row->cell[column])->text = g_strdup (text);
}
break;
- case GTK_CMCELL_PIXMAP:
- if (pixmap)
+ case GTK_CMCELL_PIXBUF:
+ if (pixbuf)
{
- clist_row->cell[column].type = GTK_CMCELL_PIXMAP;
- GTK_CMCELL_PIXMAP (clist_row->cell[column])->pixmap = pixmap;
- /* We set the mask even if it is NULL */
- GTK_CMCELL_PIXMAP (clist_row->cell[column])->mask = mask;
+ clist_row->cell[column].type = GTK_CMCELL_PIXBUF;
+ GTK_CMCELL_PIXBUF (clist_row->cell[column])->pixbuf = pixbuf;
}
break;
case GTK_CMCELL_PIXTEXT:
GTK_CMCELL_PIXTEXT (clist_row->cell[column])->text = g_strdup (text);
else
GTK_CMCELL_PIXTEXT (clist_row->cell[column])->text = NULL;
- if (pixmap)
+ if (pixbuf)
{
- GTK_CMCELL_PIXTEXT (clist_row->cell[column])->pixmap = pixmap;
- GTK_CMCELL_PIXTEXT (clist_row->cell[column])->mask = mask;
+ GTK_CMCELL_PIXTEXT (clist_row->cell[column])->pixbuf = pixbuf;
}
else
{
- GTK_CMCELL_PIXTEXT (clist_row->cell[column])->pixmap = NULL;
- GTK_CMCELL_PIXTEXT (clist_row->cell[column])->mask = NULL;
+ GTK_CMCELL_PIXTEXT (clist_row->cell[column])->pixbuf = NULL;
}
}
- else if (text && pixmap)
+ else if (text && pixbuf)
{
clist_row->cell[column].type = GTK_CMCELL_PIXTEXT;
GTK_CMCELL_PIXTEXT (clist_row->cell[column])->text = g_strdup (text);
GTK_CMCELL_PIXTEXT (clist_row->cell[column])->spacing = spacing;
- GTK_CMCELL_PIXTEXT (clist_row->cell[column])->pixmap = pixmap;
- GTK_CMCELL_PIXTEXT (clist_row->cell[column])->mask = mask;
+ GTK_CMCELL_PIXTEXT (clist_row->cell[column])->pixbuf = pixbuf;
}
break;
default:
column_auto_resize (clist, clist_row, column, requisition.width);
g_free (old_text);
- if (old_pixmap)
- g_object_unref (old_pixmap);
- if (old_mask)
- g_object_unref (old_mask);
+ if (old_pixbuf)
+ g_object_unref (old_pixbuf);
}
static void
GtkCMCTreeNode *node,
const gchar *text,
guint8 spacing,
- GdkPixmap *pixmap_closed,
- GdkBitmap *mask_closed,
- GdkPixmap *pixmap_opened,
- GdkBitmap *mask_opened,
+ GdkPixbuf *pixbuf_closed,
+ GdkPixbuf *pixbuf_opened,
gboolean is_leaf,
gboolean expanded)
{
- if (GTK_CMCTREE_ROW (node)->pixmap_opened)
+ if (GTK_CMCTREE_ROW (node)->pixbuf_opened)
{
- g_object_unref (GTK_CMCTREE_ROW (node)->pixmap_opened);
- if (GTK_CMCTREE_ROW (node)->mask_opened)
- g_object_unref (GTK_CMCTREE_ROW (node)->mask_opened);
+ g_object_unref (GTK_CMCTREE_ROW (node)->pixbuf_opened);
}
- if (GTK_CMCTREE_ROW (node)->pixmap_closed)
+ if (GTK_CMCTREE_ROW (node)->pixbuf_closed)
{
- g_object_unref (GTK_CMCTREE_ROW (node)->pixmap_closed);
- if (GTK_CMCTREE_ROW (node)->mask_closed)
- g_object_unref (GTK_CMCTREE_ROW (node)->mask_closed);
+ g_object_unref (GTK_CMCTREE_ROW (node)->pixbuf_closed);
}
- GTK_CMCTREE_ROW (node)->pixmap_opened = NULL;
- GTK_CMCTREE_ROW (node)->mask_opened = NULL;
- GTK_CMCTREE_ROW (node)->pixmap_closed = NULL;
- GTK_CMCTREE_ROW (node)->mask_closed = NULL;
+ GTK_CMCTREE_ROW (node)->pixbuf_opened = NULL;
+ GTK_CMCTREE_ROW (node)->pixbuf_closed = NULL;
- if (pixmap_closed)
+ if (pixbuf_closed)
{
- GTK_CMCTREE_ROW (node)->pixmap_closed = g_object_ref (pixmap_closed);
- if (mask_closed)
- GTK_CMCTREE_ROW (node)->mask_closed = g_object_ref (mask_closed);
+ GTK_CMCTREE_ROW (node)->pixbuf_closed = g_object_ref (pixbuf_closed);
}
- if (pixmap_opened)
+ if (pixbuf_opened)
{
- GTK_CMCTREE_ROW (node)->pixmap_opened = g_object_ref (pixmap_opened);
- if (mask_opened)
- GTK_CMCTREE_ROW (node)->mask_opened = g_object_ref (mask_opened);
+ GTK_CMCTREE_ROW (node)->pixbuf_opened = g_object_ref (pixbuf_opened);
}
GTK_CMCTREE_ROW (node)->is_leaf = is_leaf;
if (GTK_CMCTREE_ROW (node)->expanded)
gtk_cmctree_node_set_pixtext (ctree, node, ctree->tree_column,
- text, spacing, pixmap_opened, mask_opened);
+ text, spacing, pixbuf_opened);
else
gtk_cmctree_node_set_pixtext (ctree, node, ctree->tree_column,
- text, spacing, pixmap_closed, mask_closed);
+ text, spacing, pixbuf_closed);
}
static void
ctree_row->row.cell[i].horizontal = 0;
ctree_row->row.cell[i].style = NULL;
}
-
GTK_CMCELL_PIXTEXT (ctree_row->row.cell[ctree->tree_column])->text = NULL;
ctree_row->row.fg_set = FALSE;
ctree_row->parent = NULL;
ctree_row->sibling = NULL;
ctree_row->children = NULL;
- ctree_row->pixmap_closed = NULL;
- ctree_row->mask_closed = NULL;
- ctree_row->pixmap_opened = NULL;
- ctree_row->mask_opened = NULL;
+ ctree_row->pixbuf_closed = NULL;
+ ctree_row->pixbuf_opened = NULL;
return ctree_row;
}
for (i = 0; i < clist->columns; i++)
{
GTK_CMCLIST_GET_CLASS (clist)->set_cell_contents
- (clist, &(ctree_row->row), i, GTK_CMCELL_EMPTY, NULL, 0, NULL, NULL);
+ (clist, &(ctree_row->row), i, GTK_CMCELL_EMPTY, NULL, 0, NULL);
if (ctree_row->row.cell[i].style)
{
if (GTK_WIDGET_REALIZED (ctree))
g_object_unref (ctree_row->row.style);
}
- if (ctree_row->pixmap_closed)
+ if (ctree_row->pixbuf_closed)
{
- g_object_unref (ctree_row->pixmap_closed);
- if (ctree_row->mask_closed)
- g_object_unref (ctree_row->mask_closed);
+ g_object_unref (ctree_row->pixbuf_closed);
}
- if (ctree_row->pixmap_opened)
+ if (ctree_row->pixbuf_opened)
{
- g_object_unref (ctree_row->pixmap_opened);
- if (ctree_row->mask_opened)
- g_object_unref (ctree_row->mask_opened);
+ g_object_unref (ctree_row->pixbuf_opened);
}
if (ctree_row->row.destroy)
{
GList *node;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
if ((node = g_list_nth (clist->row_list, row)) &&
GTK_CMCTREE_ROW (node)->row.selectable)
{
GList *node;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
if ((node = g_list_nth (clist->row_list, row)))
g_signal_emit (G_OBJECT (clist), ctree_signals[TREE_UNSELECT_ROW],0,
GtkCMCTreeNode *sel_row;
gboolean node_selected;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
if (!node || GTK_CMCTREE_ROW (node)->row.state == GTK_STATE_SELECTED ||
!GTK_CMCTREE_ROW (node)->row.selectable)
{
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
if (!node || GTK_CMCTREE_ROW (node)->row.state != GTK_STATE_SELECTED)
return;
GtkCMCTree *ctree;
GtkCMCTreeNode *node;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
ctree = GTK_CMCTREE (clist);
GtkCMCTreeNode *node;
GList *list;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
ctree = GTK_CMCTREE (clist);
gint xl;
gint yu;
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
- g_return_val_if_fail (node != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
+ cm_return_val_if_fail (node != NULL, FALSE);
clist = GTK_CMCLIST (ctree);
{
GtkWidget *widget;
- g_return_val_if_fail (columns > 0, NULL);
- g_return_val_if_fail (tree_column >= 0 && tree_column < columns, NULL);
+ cm_return_val_if_fail (columns > 0, NULL);
+ cm_return_val_if_fail (tree_column >= 0 && tree_column < columns, NULL);
widget = gtk_widget_new (GTK_TYPE_CMCTREE,
"n_columns", columns,
GtkCMCTreeNode *sibling;
GtkCMCTreeNode *node;
- g_return_val_if_fail (GTK_IS_CMCTREE (clist), -1);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (clist), -1);
sibling = GTK_CMCTREE_NODE (g_list_nth (clist->row_list, row));
if (sibling)
parent = GTK_CMCTREE_ROW (sibling)->parent;
node = gtk_cmctree_insert_node (GTK_CMCTREE (clist), parent, sibling, text, 5,
- NULL, NULL, NULL, NULL, TRUE, FALSE);
+ NULL, NULL, TRUE, FALSE);
if (GTK_CMCLIST_AUTO_SORT (clist) || !sibling)
return g_list_position (clist->row_list, (GList *) node);
GtkCMCTreeNode *sibling,
gchar *text[],
guint8 spacing,
- GdkPixmap *pixmap_closed,
- GdkBitmap *mask_closed,
- GdkPixmap *pixmap_opened,
- GdkBitmap *mask_opened,
+ GdkPixbuf *pixbuf_closed,
+ GdkPixbuf *pixbuf_opened,
gboolean is_leaf,
gboolean expanded)
{
GList *list;
gint i;
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
if (sibling)
- g_return_val_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent, NULL);
+ cm_return_val_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent, NULL);
if (parent && GTK_CMCTREE_ROW (parent)->is_leaf)
return NULL;
for (i = 0; i < clist->columns; i++)
if (text[i] && i != ctree->tree_column)
GTK_CMCLIST_GET_CLASS (clist)->set_cell_contents
- (clist, &(new_row->row), i, GTK_CMCELL_TEXT, text[i], 0, NULL, NULL);
+ (clist, &(new_row->row), i, GTK_CMCELL_TEXT, text[i], 0, NULL);
set_node_info (ctree, node, text ?
- text[ctree->tree_column] : NULL, spacing, pixmap_closed,
- mask_closed, pixmap_opened, mask_opened, is_leaf, expanded);
+ text[ctree->tree_column] : NULL, spacing, pixbuf_closed,
+ pixbuf_opened, is_leaf, expanded);
/* sorted insertion */
if (GTK_CMCLIST_AUTO_SORT (clist))
GNode *work;
guint depth = 1;
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
- g_return_val_if_fail (gnode != NULL, NULL);
- g_return_val_if_fail (func != NULL, NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (gnode != NULL, NULL);
+ cm_return_val_if_fail (func != NULL, NULL);
if (sibling)
- g_return_val_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent, NULL);
+ cm_return_val_if_fail (GTK_CMCTREE_ROW (sibling)->parent == parent, NULL);
clist = GTK_CMCLIST (ctree);
gtk_cmclist_freeze (clist);
- set_node_info (ctree, cnode, "", 0, NULL, NULL, NULL, NULL, TRUE, FALSE);
+ set_node_info (ctree, cnode, "", 0, NULL, NULL, TRUE, FALSE);
if (!func (ctree, depth, gnode, cnode, data))
{
GNode *gnode;
gint depth;
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
- g_return_val_if_fail (node != NULL, NULL);
- g_return_val_if_fail (func != NULL, NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (node != NULL, NULL);
+ cm_return_val_if_fail (func != NULL, NULL);
if (sibling)
{
- g_return_val_if_fail (parent != NULL, NULL);
- g_return_val_if_fail (sibling->parent == parent, NULL);
+ cm_return_val_if_fail (parent != NULL, NULL);
+ cm_return_val_if_fail (sibling->parent == parent, NULL);
}
gnode = g_node_new (NULL);
{
GtkCMCTreeNode *node;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
node = GTK_CMCTREE_NODE (g_list_nth (clist->row_list, row));
{
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
clist = GTK_CMCLIST (ctree);
GtkCMCTreeNode *work;
GtkCMCTreeNode *ptr;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
ctree = GTK_CMCTREE (clist);
GtkCMCTreeNode *work;
GtkCMCTreeNode *tmp;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (func != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (func != NULL);
if (node)
work = GTK_CMCTREE_ROW (node)->children;
GtkCMCTreeNode *work;
GtkCMCTreeNode *tmp;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (func != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (func != NULL);
if (depth < 0)
{
GtkCMCTreeNode *work;
GtkCMCTreeNode *tmp;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (func != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (func != NULL);
if (node)
{
GtkCMCTreeNode *work;
GtkCMCTreeNode *tmp;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (func != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (func != NULL);
if (depth < 0)
{
{
GtkCMCTreeRow *work;
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
- g_return_val_if_fail (node != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
+ cm_return_val_if_fail (node != NULL, FALSE);
work = GTK_CMCTREE_ROW (node);
gtk_cmctree_last (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
if (!node)
return NULL;
{
GtkCMCTreeNode *node;
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
- g_return_val_if_fail (ctree_row != NULL, NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (ctree_row != NULL, NULL);
if (ctree_row->parent)
node = GTK_CMCTREE_ROW (ctree_row->parent)->children;
gtk_cmctree_node_nth (GtkCMCTree *ctree,
guint row)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
if ((row >= GTK_CMCLIST(ctree)->rows))
return NULL;
GtkCMCTreeNode *node,
GtkCMCTreeNode *child)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
- g_return_val_if_fail (node != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
+ cm_return_val_if_fail (node != NULL, FALSE);
if (GTK_CMCTREE_ROW (node)->children)
return gtk_cmctree_find (ctree, GTK_CMCTREE_ROW (node)->children, child);
{
GList *list = NULL;
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
/* if node == NULL then look in the whole tree */
if (!node)
{
GtkCMCTreeNode *work;
- g_return_val_if_fail (func != NULL, NULL);
+ cm_return_val_if_fail (func != NULL, NULL);
if (!node)
node = GTK_CMCTREE_NODE (GTK_CMCLIST (ctree)->row_list);
{
GList *list = NULL;
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
- g_return_val_if_fail (func != NULL, NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (func != NULL, NULL);
/* if node == NULL then look in the whole tree */
if (!node)
gint column;
gint row;
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
if (gtk_cmclist_get_selection_info (GTK_CMCLIST (ctree), x, y, &row, &column))
if ((node = GTK_CMCTREE_NODE(g_list_nth (GTK_CMCLIST (ctree)->row_list, row))))
GtkCMCTreeNode *new_parent,
GtkCMCTreeNode *new_sibling)
{
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
g_signal_emit (G_OBJECT (ctree), ctree_signals[TREE_MOVE], 0, node,
new_parent, new_sibling);
gtk_cmctree_expand (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
if (GTK_CMCTREE_ROW (node)->is_leaf)
return;
GtkCMCList *clist;
gboolean thaw = FALSE;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
clist = GTK_CMCLIST (ctree);
GtkCMCList *clist;
gboolean thaw = FALSE;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
clist = GTK_CMCLIST (ctree);
gtk_cmctree_collapse (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
if (GTK_CMCTREE_ROW (node)->is_leaf)
return;
gboolean thaw = FALSE;
gint i;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
if (node && GTK_CMCTREE_ROW (node)->is_leaf)
return;
gboolean thaw = FALSE;
gint i;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
if (node && GTK_CMCTREE_ROW (node)->is_leaf)
return;
gtk_cmctree_toggle_expansion (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
if (GTK_CMCTREE_ROW (node)->is_leaf)
return;
GtkCMCList *clist;
gboolean thaw = FALSE;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
if (node && GTK_CMCTREE_ROW (node)->is_leaf)
return;
gtk_cmctree_select (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
if (GTK_CMCTREE_ROW (node)->row.selectable)
g_signal_emit (G_OBJECT (ctree), ctree_signals[TREE_SELECT_ROW], 0,
gtk_cmctree_unselect (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
g_signal_emit (G_OBJECT (ctree), ctree_signals[TREE_UNSELECT_ROW], 0,
node, -1);
GtkCMCList *clist;
gboolean thaw = FALSE;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
clist = GTK_CMCLIST (ctree);
{
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
if (column < 0 || column >= GTK_CMCLIST (ctree)->columns)
return;
GTK_CMCLIST_GET_CLASS (clist)->set_cell_contents
(clist, &(GTK_CMCTREE_ROW (node)->row), column, GTK_CMCELL_TEXT,
- text, 0, NULL, NULL);
+ text, 0, NULL);
tree_draw_node (ctree, node);
}
void
-gtk_cmctree_node_set_pixmap (GtkCMCTree *ctree,
+gtk_cmctree_node_set_pixbuf (GtkCMCTree *ctree,
GtkCMCTreeNode *node,
gint column,
- GdkPixmap *pixmap,
- GdkBitmap *mask)
+ GdkPixbuf *pixbuf)
{
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
- g_return_if_fail (pixmap != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
+ cm_return_if_fail (pixbuf != NULL);
if (column < 0 || column >= GTK_CMCLIST (ctree)->columns)
return;
- g_object_ref (pixmap);
- if (mask)
- g_object_ref (mask);
+ g_object_ref (pixbuf);
clist = GTK_CMCLIST (ctree);
GTK_CMCLIST_GET_CLASS (clist)->set_cell_contents
- (clist, &(GTK_CMCTREE_ROW (node)->row), column, GTK_CMCELL_PIXMAP,
- NULL, 0, pixmap, mask);
+ (clist, &(GTK_CMCTREE_ROW (node)->row), column, GTK_CMCELL_PIXBUF,
+ NULL, 0, pixbuf);
tree_draw_node (ctree, node);
}
gint column,
const gchar *text,
guint8 spacing,
- GdkPixmap *pixmap,
- GdkBitmap *mask)
+ GdkPixbuf *pixbuf)
{
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
if (column != ctree->tree_column)
- g_return_if_fail (pixmap != NULL);
+ cm_return_if_fail (pixbuf != NULL);
if (column < 0 || column >= GTK_CMCLIST (ctree)->columns)
return;
clist = GTK_CMCLIST (ctree);
- if (pixmap)
+ if (pixbuf)
{
- g_object_ref (pixmap);
- if (mask)
- g_object_ref (mask);
+ g_object_ref (pixbuf);
}
GTK_CMCLIST_GET_CLASS (clist)->set_cell_contents
(clist, &(GTK_CMCTREE_ROW (node)->row), column, GTK_CMCELL_PIXTEXT,
- text, spacing, pixmap, mask);
+ text, spacing, pixbuf);
tree_draw_node (ctree, node);
}
GtkCMCTreeNode *node,
const gchar *text,
guint8 spacing,
- GdkPixmap *pixmap_closed,
- GdkBitmap *mask_closed,
- GdkPixmap *pixmap_opened,
- GdkBitmap *mask_opened,
+ GdkPixbuf *pixbuf_closed,
+ GdkPixbuf *pixbuf_opened,
gboolean is_leaf,
gboolean expanded)
{
gboolean old_leaf;
gboolean old_expanded;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
old_leaf = GTK_CMCTREE_ROW (node)->is_leaf;
old_expanded = GTK_CMCTREE_ROW (node)->expanded;
}
}
- set_node_info (ctree, node, text, spacing, pixmap_closed, mask_closed,
- pixmap_opened, mask_opened, is_leaf, expanded);
+ set_node_info (ctree, node, text, spacing, pixbuf_closed,
+ pixbuf_opened, is_leaf, expanded);
if (!is_leaf && !old_leaf)
{
GtkRequisition requisition;
gboolean visible = FALSE;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
if (column < 0 || column >= GTK_CMCLIST (ctree)->columns)
return;
GtkCMCTreeNode *node,
gboolean selectable)
{
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
if (selectable == GTK_CMCTREE_ROW (node)->row.selectable)
return;
gtk_cmctree_node_get_selectable (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
- g_return_val_if_fail (node != NULL, FALSE);
+ cm_return_val_if_fail (node != NULL, FALSE);
return GTK_CMCTREE_ROW (node)->row.selectable;
}
GtkCMCTreeNode *node,
gint column)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), -1);
- g_return_val_if_fail (node != NULL, -1);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), -1);
+ cm_return_val_if_fail (node != NULL, -1);
if (column < 0 || column >= GTK_CMCLIST (ctree)->columns)
return -1;
gint column,
gchar **text)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
- g_return_val_if_fail (node != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
+ cm_return_val_if_fail (node != NULL, FALSE);
if (column < 0 || column >= GTK_CMCLIST (ctree)->columns)
return FALSE;
}
gboolean
-gtk_cmctree_node_get_pixmap (GtkCMCTree *ctree,
+gtk_cmctree_node_get_pixbuf (GtkCMCTree *ctree,
GtkCMCTreeNode *node,
gint column,
- GdkPixmap **pixmap,
- GdkBitmap **mask)
+ GdkPixbuf **pixbuf)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
- g_return_val_if_fail (node != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
+ cm_return_val_if_fail (node != NULL, FALSE);
if (column < 0 || column >= GTK_CMCLIST (ctree)->columns)
return FALSE;
- if (GTK_CMCTREE_ROW (node)->row.cell[column].type != GTK_CMCELL_PIXMAP)
+ if (GTK_CMCTREE_ROW (node)->row.cell[column].type != GTK_CMCELL_PIXBUF)
return FALSE;
- if (pixmap)
- *pixmap = GTK_CMCELL_PIXMAP (GTK_CMCTREE_ROW (node)->row.cell[column])->pixmap;
- if (mask)
- *mask = GTK_CMCELL_PIXMAP (GTK_CMCTREE_ROW (node)->row.cell[column])->mask;
+ if (pixbuf)
+ *pixbuf = GTK_CMCELL_PIXBUF (GTK_CMCTREE_ROW (node)->row.cell[column])->pixbuf;
return TRUE;
}
gint column,
gchar **text,
guint8 *spacing,
- GdkPixmap **pixmap,
- GdkBitmap **mask)
+ GdkPixbuf **pixbuf)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
- g_return_val_if_fail (node != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
+ cm_return_val_if_fail (node != NULL, FALSE);
if (column < 0 || column >= GTK_CMCLIST (ctree)->columns)
return FALSE;
if (spacing)
*spacing = GTK_CMCELL_PIXTEXT (GTK_CMCTREE_ROW
(node)->row.cell[column])->spacing;
- if (pixmap)
- *pixmap = GTK_CMCELL_PIXTEXT (GTK_CMCTREE_ROW
- (node)->row.cell[column])->pixmap;
- if (mask)
- *mask = GTK_CMCELL_PIXTEXT (GTK_CMCTREE_ROW (node)->row.cell[column])->mask;
+ if (pixbuf)
+ *pixbuf = GTK_CMCELL_PIXTEXT (GTK_CMCTREE_ROW
+ (node)->row.cell[column])->pixbuf;
return TRUE;
}
GtkCMCTreeNode *node,
gchar **text,
guint8 *spacing,
- GdkPixmap **pixmap_closed,
- GdkBitmap **mask_closed,
- GdkPixmap **pixmap_opened,
- GdkBitmap **mask_opened,
+ GdkPixbuf **pixbuf_closed,
+ GdkPixbuf **pixbuf_opened,
gboolean *is_leaf,
gboolean *expanded)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
- g_return_val_if_fail (node != NULL, FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
+ cm_return_val_if_fail (node != NULL, FALSE);
if (text)
*text = GTK_CMCELL_PIXTEXT
if (spacing)
*spacing = GTK_CMCELL_PIXTEXT
(GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->spacing;
- if (pixmap_closed)
- *pixmap_closed = GTK_CMCTREE_ROW (node)->pixmap_closed;
- if (mask_closed)
- *mask_closed = GTK_CMCTREE_ROW (node)->mask_closed;
- if (pixmap_opened)
- *pixmap_opened = GTK_CMCTREE_ROW (node)->pixmap_opened;
- if (mask_opened)
- *mask_opened = GTK_CMCTREE_ROW (node)->mask_opened;
+ if (pixbuf_closed)
+ *pixbuf_closed = GTK_CMCTREE_ROW (node)->pixbuf_closed;
+ if (pixbuf_opened)
+ *pixbuf_opened = GTK_CMCTREE_ROW (node)->pixbuf_opened;
if (is_leaf)
*is_leaf = GTK_CMCTREE_ROW (node)->is_leaf;
if (expanded)
GtkRequisition requisition;
gboolean visible = FALSE;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
clist = GTK_CMCLIST (ctree);
GtkCMCTreeNode *node,
gint column)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
- g_return_val_if_fail (node != NULL, NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (node != NULL, NULL);
if (column < 0 || column >= GTK_CMCLIST (ctree)->columns)
return NULL;
gint *old_width = NULL;
gint i;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
clist = GTK_CMCLIST (ctree);
gtk_cmctree_node_get_row_style (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
- g_return_val_if_fail (node != NULL, NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (node != NULL, NULL);
return GTK_CMCTREE_ROW (node)->row.style;
}
GtkCMCTreeNode *node,
const GdkColor *color)
{
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
if (color)
{
GtkCMCTreeNode *node,
const GdkColor *color)
{
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
if (color)
{
GDestroyNotify dnotify;
gpointer ddata;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (node != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (node != NULL);
dnotify = GTK_CMCTREE_ROW (node)->row.destroy;
ddata = GTK_CMCTREE_ROW (node)->row.data;
gtk_cmctree_node_get_row_data (GtkCMCTree *ctree,
GtkCMCTreeNode *node)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), NULL);
return node ? GTK_CMCTREE_ROW (node)->row.data : NULL;
}
gint row = -1;
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
clist = GTK_CMCLIST (ctree);
{
gint row;
- g_return_val_if_fail (ctree != NULL, 0);
- g_return_val_if_fail (node != NULL, 0);
+ cm_return_val_if_fail (ctree != NULL, 0);
+ cm_return_val_if_fail (node != NULL, 0);
row = g_list_position (GTK_CMCLIST (ctree)->row_list, (GList*) node);
return gtk_cmclist_row_is_visible (GTK_CMCLIST (ctree), row);
{
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (indent >= 0);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (indent >= 0);
if (indent == ctree->tree_indent)
return;
GtkCMCList *clist;
gint old_spacing;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
- g_return_if_fail (spacing >= 0);
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (spacing >= 0);
if (spacing == ctree->tree_spacing)
return;
gtk_cmctree_set_show_stub (GtkCMCTree *ctree,
gboolean show_stub)
{
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
show_stub = show_stub != FALSE;
GtkCMCList *clist;
GtkCMCTreeLineStyle old_style;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
if (line_style == ctree->line_style)
return;
GtkCMCList *clist;
GtkCMCTreeExpanderStyle old_style;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
if (expander_style == ctree->expander_style)
return;
GtkCMCList *clist;
GtkCMCTreeNode *focus_node = NULL;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
clist = GTK_CMCLIST (ctree);
GtkCMCList *clist;
GtkCMCTreeNode *focus_node = NULL;
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
clist = GTK_CMCLIST (ctree);
gint row;
gboolean unselect;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
if (clist->selection_mode != GTK_SELECTION_MULTIPLE)
return;
GtkCMCTree *ctree;
GList *work;
- g_return_if_fail (GTK_IS_CMCTREE (clist));
+ cm_return_if_fail (GTK_IS_CMCTREE (clist));
if (clist->selection_mode != GTK_SELECTION_MULTIPLE)
return;
gtk_cmctree_set_drag_compare_func (GtkCMCTree *ctree,
GtkCMCTreeCompareDragFunc cmp_func)
{
- g_return_if_fail (GTK_IS_CMCTREE (ctree));
+ cm_return_if_fail (GTK_IS_CMCTREE (ctree));
ctree->drag_compare = cmp_func;
}
GtkCMCTreeNode *drag_target,
GtkCMCListDragPos insert_pos)
{
- g_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (ctree), FALSE);
if (drag_source && drag_source != drag_target &&
(!GTK_CMCTREE_ROW (drag_source)->children ||
GtkCMCTree *ctree;
gboolean use_icons;
- g_return_if_fail (GTK_IS_CMCTREE (widget));
- g_return_if_fail (context != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (widget));
+ cm_return_if_fail (context != NULL);
clist = GTK_CMCLIST (widget);
ctree = GTK_CMCTREE (widget);
GTK_CMCLIST_SET_FLAG (clist, CMCLIST_USE_DRAG_ICONS);
node = GTK_CMCTREE_NODE (g_list_nth (clist->row_list,
clist->click_cell.row));
- if (node)
- {
- if (GTK_CMCELL_PIXTEXT
- (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixmap)
- {
- gtk_drag_set_icon_pixmap
- (context,
- gtk_widget_get_colormap (widget),
- GTK_CMCELL_PIXTEXT
- (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->pixmap,
- GTK_CMCELL_PIXTEXT
- (GTK_CMCTREE_ROW (node)->row.cell[ctree->tree_column])->mask,
- -2, -2);
- return;
- }
- }
gtk_drag_set_icon_default (context);
}
}
GtkCMCListDestInfo new_info;
GtkCMCListDestInfo *dest_info;
- g_return_val_if_fail (GTK_IS_CMCTREE (widget), FALSE);
+ cm_return_val_if_fail (GTK_IS_CMCTREE (widget), FALSE);
clist = GTK_CMCLIST (widget);
ctree = GTK_CMCTREE (widget);
GtkCMCTree *ctree;
GtkCMCList *clist;
- g_return_if_fail (GTK_IS_CMCTREE (widget));
- g_return_if_fail (context != NULL);
- g_return_if_fail (selection_data != NULL);
+ cm_return_if_fail (GTK_IS_CMCTREE (widget));
+ cm_return_if_fail (context != NULL);
+ cm_return_if_fail (selection_data != NULL);
ctree = GTK_CMCTREE (widget);
clist = GTK_CMCLIST (widget);
projects / claws.git / blobdiff