forked from AuroraMiddleware/gtk
66f87948e2
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
197 lines
8.6 KiB
C
197 lines
8.6 KiB
C
/* gtktreeprivate.h
|
|
* Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford <jrb@redhat.com>
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Library General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Library General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Library General Public
|
|
* License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
* Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#ifndef __GTK_TREE_PRIVATE_H__
|
|
#define __GTK_TREE_PRIVATE_H__
|
|
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif /* __cplusplus */
|
|
|
|
#include <gtk/gtktreeview.h>
|
|
#include <gtk/gtktreeselection.h>
|
|
#include <gtk/gtkrbtree.h>
|
|
|
|
typedef enum
|
|
{
|
|
GTK_TREE_VIEW_IS_LIST = 1 << 0,
|
|
GTK_TREE_VIEW_SHOW_EXPANDERS = 1 << 1,
|
|
GTK_TREE_VIEW_IN_COLUMN_RESIZE = 1 << 2,
|
|
GTK_TREE_VIEW_ARROW_PRELIT = 1 << 3,
|
|
GTK_TREE_VIEW_HEADERS_VISIBLE = 1 << 4,
|
|
GTK_TREE_VIEW_DRAW_KEYFOCUS = 1 << 5,
|
|
GTK_TREE_VIEW_MODEL_SETUP = 1 << 6
|
|
} GtkTreeViewFlags;
|
|
|
|
#define GTK_TREE_VIEW_SET_FLAG(tree_view, flag) G_STMT_START{ (tree_view->priv->flags|=flag); }G_STMT_END
|
|
#define GTK_TREE_VIEW_UNSET_FLAG(tree_view, flag) G_STMT_START{ (tree_view->priv->flags&=~(flag)); }G_STMT_END
|
|
#define GTK_TREE_VIEW_FLAG_SET(tree_view, flag) ((tree_view->priv->flags&flag)==flag)
|
|
#define TREE_VIEW_HEADER_HEIGHT(tree_view) (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE)?tree_view->priv->header_height:0)
|
|
#define TREE_VIEW_COLUMN_SIZE(column) (CLAMP (column->size, (column->min_width!=-1)?column->min_width:column->size, (column->max_width!=-1)?column->max_width:column->size))
|
|
#define TREE_VIEW_DRAW_EXPANDERS(tree_view) (!GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IS_LIST)&>K_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_SHOW_EXPANDERS))
|
|
|
|
struct _GtkTreeViewPrivate
|
|
{
|
|
GtkTreeModel *model;
|
|
|
|
guint flags;
|
|
/* tree information */
|
|
GtkRBTree *tree;
|
|
|
|
gint tab_offset;
|
|
GtkRBNode *button_pressed_node;
|
|
GtkRBTree *button_pressed_tree;
|
|
|
|
GList *children;
|
|
gint width;
|
|
gint height;
|
|
|
|
GtkAdjustment *hadjustment;
|
|
GtkAdjustment *vadjustment;
|
|
|
|
GdkWindow *bin_window;
|
|
GdkWindow *header_window;
|
|
|
|
/* Selection stuff */
|
|
GtkTreePath *anchor;
|
|
GtkTreePath *cursor;
|
|
|
|
/* Column Resizing */
|
|
GdkCursor *cursor_drag;
|
|
GdkGC *xor_gc;
|
|
gint drag_pos;
|
|
gint x_drag;
|
|
|
|
/* Prelight information */
|
|
GtkRBNode *prelight_node;
|
|
GtkRBTree *prelight_tree;
|
|
gint prelight_offset;
|
|
|
|
/* Selection information */
|
|
GtkTreeSelection *selection;
|
|
|
|
/* Header information */
|
|
gint n_columns;
|
|
GList *columns;
|
|
gint header_height;
|
|
};
|
|
|
|
#ifdef __GNUC__
|
|
|
|
#define TREE_VIEW_INTERNAL_ASSERT(expr, ret) G_STMT_START{ \
|
|
if (!(expr)) \
|
|
{ \
|
|
g_log (G_LOG_DOMAIN, \
|
|
G_LOG_LEVEL_CRITICAL, \
|
|
"file %s: line %d (%s): assertion `%s' failed.\n" \
|
|
"There is a disparity between the internal view of the GtkTreeView,\n" \
|
|
"and the GtkTreeModel. This generally means that the model has changed\n"\
|
|
"without letting the view know. Any display from now on is likely to\n" \
|
|
"be incorrect.\n", \
|
|
__FILE__, \
|
|
__LINE__, \
|
|
__PRETTY_FUNCTION__, \
|
|
#expr); \
|
|
return ret; \
|
|
}; }G_STMT_END
|
|
|
|
#define TREE_VIEW_INTERNAL_ASSERT_VOID(expr) G_STMT_START{ \
|
|
if (!(expr)) \
|
|
{ \
|
|
g_log (G_LOG_DOMAIN, \
|
|
G_LOG_LEVEL_CRITICAL, \
|
|
"file %s: line %d (%s): assertion `%s' failed.\n" \
|
|
"There is a disparity between the internal view of the GtkTreeView,\n" \
|
|
"and the GtkTreeModel. This generally means that the model has changed\n"\
|
|
"without letting the view know. Any display from now on is likely to\n" \
|
|
"be incorrect.\n", \
|
|
__FILE__, \
|
|
__LINE__, \
|
|
__PRETTY_FUNCTION__, \
|
|
#expr); \
|
|
return; \
|
|
}; }G_STMT_END
|
|
|
|
#else
|
|
|
|
#define TREE_VIEW_INTERNAL_ASSERT(expr, ret) G_STMT_START{ \
|
|
if (!(expr)) \
|
|
{ \
|
|
g_log (G_LOG_DOMAIN, \
|
|
G_LOG_LEVEL_CRITICAL, \
|
|
"file %s: line %d: assertion `%s' failed.\n" \
|
|
"There is a disparity between the internal view of the GtkTreeView,\n" \
|
|
"and the GtkTreeModel. This generally means that the model has changed\n"\
|
|
"without letting the view know. Any display from now on is likely to\n" \
|
|
"be incorrect.\n", \
|
|
__FILE__, \
|
|
__LINE__, \
|
|
#expr); \
|
|
return ret; \
|
|
}; }G_STMT_END
|
|
|
|
#define TREE_VIEW_INTERNAL_ASSERT_VOID(expr) G_STMT_START{ \
|
|
if (!(expr)) \
|
|
{ \
|
|
g_log (G_LOG_DOMAIN, \
|
|
G_LOG_LEVEL_CRITICAL, \
|
|
"file %s: line %d: assertion '%s' failed.\n" \
|
|
"There is a disparity between the internal view of the GtkTreeView,\n" \
|
|
"and the GtkTreeModel. This generally means that the model has changed\n"\
|
|
"without letting the view know. Any display from now on is likely to\n" \
|
|
"be incorrect.\n", \
|
|
__FILE__, \
|
|
__LINE__, \
|
|
#expr); \
|
|
return; \
|
|
}; }G_STMT_END
|
|
#endif
|
|
|
|
/* functions that shouldn't be exported */
|
|
void _gtk_tree_selection_internal_select_node (GtkTreeSelection *selection,
|
|
GtkRBNode *node,
|
|
GtkRBTree *tree,
|
|
GtkTreePath *path,
|
|
GdkModifierType state);
|
|
gboolean _gtk_tree_view_find_node (GtkTreeView *tree_view,
|
|
GtkTreePath *path,
|
|
GtkRBTree **tree,
|
|
GtkRBNode **node);
|
|
GtkTreePath *_gtk_tree_view_find_path (GtkTreeView *tree_view,
|
|
GtkRBTree *tree,
|
|
GtkRBNode *node);
|
|
void _gtk_tree_view_set_size (GtkTreeView *tree_view,
|
|
gint width,
|
|
gint height);
|
|
|
|
|
|
GtkTreeSelection* _gtk_tree_selection_new (void);
|
|
GtkTreeSelection* _gtk_tree_selection_new_with_tree_view (GtkTreeView *tree_view);
|
|
void _gtk_tree_selection_set_tree_view (GtkTreeSelection *selection,
|
|
GtkTreeView *tree_view);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif /* __cplusplus */
|
|
|
|
|
|
#endif /* __GTK_TREE_PRIVATE_H__ */
|
|
|